From 4d4a1e351507c9bbc388c2c52b7c3eb26c20237b Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 4 Mar 2018 18:13:05 +1100 Subject: [PATCH] build fix? --- .../sapphire_zone/Script/ScriptLoader.h | 3 +- .../Script/Scripts/ScriptObject.h | 1 + .../ThePalaceoftheDeadFloors101110.cpp | 1 - .../ThePalaceoftheDeadFloors110.cpp | 1 - .../ThePalaceoftheDeadFloors111120.cpp | 1 - .../ThePalaceoftheDeadFloors1120.cpp | 1 - .../ThePalaceoftheDeadFloors121130.cpp | 1 - .../ThePalaceoftheDeadFloors131140.cpp | 1 - .../ThePalaceoftheDeadFloors141150.cpp | 1 - .../ThePalaceoftheDeadFloors151160.cpp | 1 - .../ThePalaceoftheDeadFloors161170.cpp | 1 - .../ThePalaceoftheDeadFloors171180.cpp | 1 - .../ThePalaceoftheDeadFloors181190.cpp | 1 - .../ThePalaceoftheDeadFloors191200.cpp | 1 - .../ThePalaceoftheDeadFloors2130.cpp | 1 - .../ThePalaceoftheDeadFloors3140.cpp | 1 - .../ThePalaceoftheDeadFloors4150.cpp | 1 - .../ThePalaceoftheDeadFloors5160.cpp | 1 - .../ThePalaceoftheDeadFloors6170.cpp | 1 - .../ThePalaceoftheDeadFloors7180.cpp | 1 - .../ThePalaceoftheDeadFloors8190.cpp | 1 - .../ThePalaceoftheDeadFloors91100.cpp | 1 - .../Scripts/instances/dungeons/AlaMhigo.cpp | 1 - .../instances/dungeons/AmdaporKeep.cpp | 1 - .../instances/dungeons/AmdaporKeepHard.cpp | 1 - .../instances/dungeons/BaelsarsWall.cpp | 1 - .../instances/dungeons/BardamsMettle.cpp | 1 - .../instances/dungeons/BrayfloxsLongstop.cpp | 1 - .../dungeons/BrayfloxsLongstopHard.cpp | 1 - .../instances/dungeons/CastrumAbania.cpp | 1 - .../instances/dungeons/CastrumMeridianum.cpp | 1 - .../instances/dungeons/CopperbellMines.cpp | 1 - .../dungeons/CopperbellMinesHard.cpp | 1 - .../Scripts/instances/dungeons/CuttersCry.cpp | 1 - .../Scripts/instances/dungeons/DomaCastle.cpp | 1 - .../instances/dungeons/DzemaelDarkhold.cpp | 1 - .../Scripts/instances/dungeons/Halatali.cpp | 1 - .../instances/dungeons/HalataliHard.cpp | 1 - .../instances/dungeons/HaukkeManor.cpp | 1 - .../instances/dungeons/HaukkeManorHard.cpp | 1 - .../Scripts/instances/dungeons/HellsLid.cpp | 1 - .../instances/dungeons/HullbreakerIsle.cpp | 1 - .../dungeons/HullbreakerIsleHard.cpp | 1 - .../instances/dungeons/KuganeCastle.cpp | 1 - .../Scripts/instances/dungeons/Neverreap.cpp | 1 - .../instances/dungeons/PharosSirius.cpp | 1 - .../instances/dungeons/PharosSiriusHard.cpp | 1 - .../dungeons/SaintMociannesArboretum.cpp | 1 - .../Scripts/instances/dungeons/Sastasha.cpp | 1 - .../instances/dungeons/SastashaHard.cpp | 1 - .../dungeons/ShisuioftheVioletTides.cpp | 1 - .../Scripts/instances/dungeons/Snowcloak.cpp | 1 - .../Scripts/instances/dungeons/SohmAl.cpp | 1 - .../Scripts/instances/dungeons/SohmAlHard.cpp | 1 - .../Scripts/instances/dungeons/SohrKhai.cpp | 1 - .../Scripts/instances/dungeons/TheAery.cpp | 1 - .../TheAetherochemicalResearchFacility.cpp | 1 - .../instances/dungeons/TheAntitower.cpp | 1 - .../instances/dungeons/TheAurumVale.cpp | 1 - .../dungeons/TheDrownedCityofSkalla.cpp | 1 - .../instances/dungeons/TheDuskVigil.cpp | 1 - .../dungeons/TheFractalContinuum.cpp | 1 - .../dungeons/TheFractalContinuumHard.cpp | 1 - .../dungeons/TheGreatGubalLibrary.cpp | 1 - .../dungeons/TheGreatGubalLibraryHard.cpp | 1 - .../instances/dungeons/TheKeeperoftheLake.cpp | 1 - .../dungeons/TheLostCityofAmdapor.cpp | 1 - .../dungeons/TheLostCityofAmdaporHard.cpp | 1 - .../instances/dungeons/ThePraetorium.cpp | 1 - .../instances/dungeons/TheSirensongSea.cpp | 1 - .../instances/dungeons/TheStoneVigil.cpp | 1 - .../instances/dungeons/TheStoneVigilHard.cpp | 1 - .../dungeons/TheSunkenTempleofQarn.cpp | 1 - .../dungeons/TheSunkenTempleofQarnHard.cpp | 1 - .../dungeons/TheTamTaraDeepcroft.cpp | 1 - .../dungeons/TheTamTaraDeepcroftHard.cpp | 1 - .../instances/dungeons/TheTempleoftheFist.cpp | 1 - .../dungeons/TheThousandMawsofTotoRak.cpp | 1 - .../Scripts/instances/dungeons/TheVault.cpp | 1 - .../instances/dungeons/TheWanderersPalace.cpp | 1 - .../dungeons/TheWanderersPalaceHard.cpp | 1 - .../Scripts/instances/dungeons/Xelphatol.cpp | 1 - .../instances/events/TheHauntedManor.cpp | 1 - .../events/TheValentionesCeremony.cpp | 1 - .../guildhests/AllsWellthatEndsintheWell.cpp | 1 - .../instances/guildhests/AnnoytheVoid.cpp | 1 - .../guildhests/BasicTrainingEnemyParties.cpp | 1 - .../BasicTrainingEnemyStrongholds.cpp | 1 - .../FlickingSticksandTakingNames.cpp | 1 - .../guildhests/HeroontheHalfShell.cpp | 1 - .../instances/guildhests/LongLivetheQueen.cpp | 1 - .../instances/guildhests/MorethanaFeeler.cpp | 1 - .../guildhests/PullingPoisonPosies.cpp | 1 - .../instances/guildhests/ShadowandClaw.cpp | 1 - .../instances/guildhests/SolemnTrinity.cpp | 1 - .../instances/guildhests/StingingBack.cpp | 1 - .../instances/guildhests/UndertheArmor.cpp | 1 - .../Scripts/instances/guildhests/WardUp.cpp | 1 - .../AccrueEnmityfromMultipleTargets.cpp | 1 - .../AssistAlliesinDefeatingaTarget.cpp | 1 - .../AvoidAreaofEffectAttacks.cpp | 1 - .../hallofthenovice/AvoidEngagedTargets.cpp | 1 - .../DefeatanOccupiedTarget.cpp | 1 - .../EngageEnemyReinforcements.cpp | 1 - .../hallofthenovice/EngageMultipleTargets.cpp | 1 - .../hallofthenovice/ExecuteaComboinBattle.cpp | 1 - .../ExecuteaCombotoIncreaseEnmity.cpp | 1 - .../ExecuteaRangedAttacktoIncreaseEnmity.cpp | 1 - .../hallofthenovice/FinalExercise.cpp | 1 - .../hallofthenovice/HealMultipleAllies.cpp | 1 - .../instances/hallofthenovice/HealanAlly.cpp | 1 - .../InteractwiththeBattlefield.cpp | 1 - .../Scripts/instances/pvp/Astragalos.cpp | 1 - .../Scripts/instances/pvp/SealRockSeize.cpp | 1 - .../pvp/TheBorderlandRuinsSecure.cpp | 1 - .../instances/pvp/TheFeast4on4LightParty.cpp | 1 - .../instances/pvp/TheFeast4on4Ranked.cpp | 1 - .../instances/pvp/TheFeast4on4Training.cpp | 1 - .../pvp/TheFeastCustomMatchCrystalTower.cpp | 1 - .../TheFeastCustomMatchFeastingGrounds.cpp | 1 - .../pvp/TheFeastCustomMatchLichenweed.cpp | 1 - .../Scripts/instances/pvp/TheFeastRanked.cpp | 1 - .../instances/pvp/TheFeastTeamRanked.cpp | 1 - .../instances/pvp/TheFeastTraining.cpp | 1 - .../instances/pvp/TheFieldsofGloryShatter.cpp | 1 - .../instances/questbattles/ABloodyReunion.cpp | 1 - .../questbattles/ASpectaclefortheAges.cpp | 1 - .../instances/questbattles/BloodDragoon.cpp | 1 - .../instances/questbattles/BloodontheDeck.cpp | 1 - .../CuriousGorgeMeetsHisMatch.cpp | 1 - .../instances/questbattles/DarkwingDragon.cpp | 1 - .../instances/questbattles/InThalsName.cpp | 1 - .../questbattles/InterdimensionalRift.cpp | 1 - .../questbattles/ItsProbablyaTrap.cpp | 1 - .../instances/questbattles/MatsubaMayhem.cpp | 1 - .../Scripts/instances/questbattles/Naadam.cpp | 1 - .../questbattles/OneLifeforOneWorld.cpp | 1 - .../instances/questbattles/OurCompromise.cpp | 1 - .../questbattles/OurUnsungHeroes.cpp | 1 - .../questbattles/RaisingtheSword.cpp | 1 - .../questbattles/ReturnoftheBull.cpp | 1 - .../questbattles/TheBattleonBekko.cpp | 1 - .../TheCarteneauFlatsHeliodrome.cpp | 1 - .../questbattles/TheFaceofTrueEvil.cpp | 1 - .../questbattles/TheHeartoftheProblem.cpp | 1 - .../TheOrphansandtheBrokenBlade.cpp | 1 - .../instances/questbattles/TheResonant.cpp | 1 - .../questbattles/WhenClansCollide.cpp | 1 - .../questbattles/WithHeartandSteel.cpp | 1 - .../raids/AlexanderTheArmoftheFather.cpp | 1 - .../AlexanderTheArmoftheFatherSavage.cpp | 1 - .../raids/AlexanderTheArmoftheSon.cpp | 1 - .../raids/AlexanderTheArmoftheSonSavage.cpp | 1 - .../raids/AlexanderTheBreathoftheCreator.cpp | 1 - .../AlexanderTheBreathoftheCreatorSavage.cpp | 1 - .../raids/AlexanderTheBurdenoftheFather.cpp | 1 - .../AlexanderTheBurdenoftheFatherSavage.cpp | 1 - .../raids/AlexanderTheBurdenoftheSon.cpp | 1 - .../AlexanderTheBurdenoftheSonSavage.cpp | 1 - .../raids/AlexanderTheCuffoftheFather.cpp | 1 - .../AlexanderTheCuffoftheFatherSavage.cpp | 1 - .../raids/AlexanderTheCuffoftheSon.cpp | 1 - .../raids/AlexanderTheCuffoftheSonSavage.cpp | 1 - .../raids/AlexanderTheEyesoftheCreator.cpp | 1 - .../AlexanderTheEyesoftheCreatorSavage.cpp | 1 - .../raids/AlexanderTheFistoftheFather.cpp | 1 - .../AlexanderTheFistoftheFatherSavage.cpp | 1 - .../raids/AlexanderTheFistoftheSon.cpp | 1 - .../raids/AlexanderTheFistoftheSonSavage.cpp | 1 - .../raids/AlexanderTheHeartoftheCreator.cpp | 1 - .../AlexanderTheHeartoftheCreatorSavage.cpp | 1 - .../raids/AlexanderTheSouloftheCreator.cpp | 1 - .../AlexanderTheSouloftheCreatorSavage.cpp | 1 - .../Scripts/instances/raids/DeltascapeV10.cpp | 1 - .../instances/raids/DeltascapeV10Savage.cpp | 1 - .../Scripts/instances/raids/DeltascapeV20.cpp | 1 - .../instances/raids/DeltascapeV20Savage.cpp | 1 - .../Scripts/instances/raids/DeltascapeV30.cpp | 1 - .../instances/raids/DeltascapeV30Savage.cpp | 1 - .../Scripts/instances/raids/DeltascapeV40.cpp | 1 - .../instances/raids/DeltascapeV40Savage.cpp | 1 - .../Scripts/instances/raids/DunScaith.cpp | 1 - .../Scripts/instances/raids/SigmascapeV10.cpp | 1 - .../instances/raids/SigmascapeV10Savage.cpp | 1 - .../Scripts/instances/raids/SigmascapeV20.cpp | 1 - .../instances/raids/SigmascapeV20Savage.cpp | 1 - .../Scripts/instances/raids/SigmascapeV30.cpp | 1 - .../instances/raids/SigmascapeV30Savage.cpp | 1 - .../Scripts/instances/raids/SigmascapeV40.cpp | 1 - .../instances/raids/SigmascapeV40Savage.cpp | 1 - .../Scripts/instances/raids/SyrcusTower.cpp | 1 - .../raids/TheBindingCoilofBahamutTurn1.cpp | 1 - .../raids/TheBindingCoilofBahamutTurn2.cpp | 1 - .../raids/TheBindingCoilofBahamutTurn3.cpp | 1 - .../raids/TheBindingCoilofBahamutTurn4.cpp | 1 - .../raids/TheBindingCoilofBahamutTurn5.cpp | 1 - .../raids/TheFinalCoilofBahamutTurn1.cpp | 1 - .../raids/TheFinalCoilofBahamutTurn2.cpp | 1 - .../raids/TheFinalCoilofBahamutTurn3.cpp | 1 - .../raids/TheFinalCoilofBahamutTurn4.cpp | 1 - .../raids/TheLabyrinthoftheAncients.cpp | 1 - .../raids/TheRoyalCityofRabanastre.cpp | 1 - .../TheSecondCoilofBahamutSavageTurn1.cpp | 1 - .../TheSecondCoilofBahamutSavageTurn2.cpp | 1 - .../TheSecondCoilofBahamutSavageTurn3.cpp | 1 - .../TheSecondCoilofBahamutSavageTurn4.cpp | 1 - .../raids/TheSecondCoilofBahamutTurn1.cpp | 1 - .../raids/TheSecondCoilofBahamutTurn2.cpp | 1 - .../raids/TheSecondCoilofBahamutTurn3.cpp | 1 - .../raids/TheSecondCoilofBahamutTurn4.cpp | 1 - .../TheUnendingCoilofBahamutUltimate.cpp | 1 - .../Scripts/instances/raids/TheVoidArk.cpp | 1 - .../instances/raids/TheWeepingCityofMhach.cpp | 1 - .../instances/raids/TheWorldofDarkness.cpp | 1 - .../TheSecondCoilofBahamutSavageTurn1.cpp | 39 ------------------- .../TheSecondCoilofBahamutSavageTurn4.cpp | 39 ------------------- .../coils/TheSecondCoilofBahamutTurn1.cpp | 39 ------------------- .../coils/TheSecondCoilofBahamutTurn2.cpp | 39 ------------------- .../instances/treasurehunt/TheAquapolis.cpp | 1 - .../treasurehunt/TheHiddenCanalsofUznair.cpp | 1 - .../treasurehunt/TheLostCanalsofUznair.cpp | 1 - .../trials/ARelicReborntheChimera.cpp | 1 - .../instances/trials/ARelicReborntheHydra.cpp | 1 - .../trials/AkhAfahAmphitheatreExtreme.cpp | 1 - .../trials/AkhAfahAmphitheatreHard.cpp | 1 - .../instances/trials/BattleintheBigKeep.cpp | 1 - .../instances/trials/BattleontheBigBridge.cpp | 1 - .../Scripts/instances/trials/CapeWestwind.cpp | 1 - .../instances/trials/ContainmentBayP1T6.cpp | 1 - .../trials/ContainmentBayP1T6Extreme.cpp | 1 - .../instances/trials/ContainmentBayS1T7.cpp | 1 - .../trials/ContainmentBayS1T7Extreme.cpp | 1 - .../instances/trials/ContainmentBayZ1T9.cpp | 1 - .../trials/ContainmentBayZ1T9Extreme.cpp | 1 - .../Scripts/instances/trials/Emanation.cpp | 1 - .../instances/trials/EmanationExtreme.cpp | 1 - .../instances/trials/SpecialEventI.cpp | 1 - .../instances/trials/SpecialEventII.cpp | 1 - .../instances/trials/SpecialEventIII.cpp | 1 - .../instances/trials/TheBowlofEmbers.cpp | 1 - .../trials/TheBowlofEmbersExtreme.cpp | 1 - .../instances/trials/TheBowlofEmbersHard.cpp | 1 - .../Scripts/instances/trials/TheChrysalis.cpp | 1 - .../instances/trials/TheDragonsNeck.cpp | 1 - .../instances/trials/TheFinalStepsofFaith.cpp | 1 - .../instances/trials/TheHowlingEye.cpp | 1 - .../instances/trials/TheHowlingEyeExtreme.cpp | 1 - .../instances/trials/TheHowlingEyeHard.cpp | 1 - .../Scripts/instances/trials/TheJadeStoa.cpp | 1 - .../instances/trials/TheJadeStoaExtreme.cpp | 1 - .../trials/TheLimitlessBlueExtreme.cpp | 1 - .../instances/trials/TheLimitlessBlueHard.cpp | 1 - .../trials/TheMinstrelsBalladNidhoggsRage.cpp | 1 - .../TheMinstrelsBalladShinryusDomain.cpp | 1 - .../TheMinstrelsBalladThordansReign.cpp | 25 ++++++++++++ .../trials/TheMinstrelsBalladUltimasBane.cpp | 1 - .../Scripts/instances/trials/TheNavel.cpp | 1 - .../instances/trials/TheNavelExtreme.cpp | 1 - .../Scripts/instances/trials/TheNavelHard.cpp | 1 - .../instances/trials/ThePoolofTribute.cpp | 1 - .../trials/ThePoolofTributeExtreme.cpp | 1 - .../instances/trials/TheRoyalMenagerie.cpp | 1 - .../trials/TheSingularityReactor.cpp | 25 ++++++++++++ .../instances/trials/TheStepsofFaith.cpp | 1 - .../trials/TheStrikingTreeExtreme.cpp | 1 - .../instances/trials/TheStrikingTreeHard.cpp | 1 - .../instances/trials/TheWhorleaterExtreme.cpp | 1 - .../instances/trials/TheWhorleaterHard.cpp | 1 - .../instances/trials/ThokastThokExtreme.cpp | 25 ++++++++++++ .../instances/trials/ThokastThokHard.cpp | 25 ++++++++++++ .../instances/trials/ThornmarchExtreme.cpp | 1 - .../instances/trials/ThornmarchHard.cpp | 1 - .../Scripts/instances/trials/UrthsFount.cpp | 1 - 273 files changed, 103 insertions(+), 420 deletions(-) delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.h b/src/servers/sapphire_zone/Script/ScriptLoader.h index 1e99d86e..6cd1efa4 100644 --- a/src/servers/sapphire_zone/Script/ScriptLoader.h +++ b/src/servers/sapphire_zone/Script/ScriptLoader.h @@ -9,7 +9,8 @@ #include "ScriptInfo.h" #ifdef _WIN32 -#include +#define WIN32_LEAN_AND_MEAN +#include typedef HMODULE ModuleHandle; #else #include diff --git a/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h b/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h index fd0c8537..a2ad2f9d 100644 --- a/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h +++ b/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h @@ -2,6 +2,7 @@ #define SAPPHIRE_SCRIPTOBJECT_H #include +#include