From 8e2859d03891aef1fb0b37e6f3c3684ce3ad8cfe Mon Sep 17 00:00:00 2001 From: ShelbyZ Date: Wed, 28 Feb 2018 20:51:47 -0800 Subject: [PATCH 1/2] Minor updates for actor_rewrite branch - The libraries/external is not correctly mapped for windows cmake, had an extra '../' - add build flag for msvc for building with multiple processors /MP --- cmake/boost.cmake | 6 +++--- cmake/compiler.cmake | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake/boost.cmake b/cmake/boost.cmake index 4f3dda80..3e1c37ef 100644 --- a/cmake/boost.cmake +++ b/cmake/boost.cmake @@ -14,10 +14,10 @@ if(UNIX) endif() else() - if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME}) + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME}) message(STATUS "Using boost in /libraries/external") - set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME}) - set(BOOST_LIBRARYDIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME}/lib32-msvc-14.0) + set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME}) + set(BOOST_LIBRARYDIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME}/lib32-msvc-14.0) else() find_package(Boost ${SAPPHIRE_BOOST_VER} COMPONENTS system) if(Boost_FOUND) diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake index ebf42d84..20bab671 100644 --- a/cmake/compiler.cmake +++ b/cmake/compiler.cmake @@ -21,6 +21,10 @@ else() # incremental linking message(STATUS "Enabling Incremental Linking..") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL") + + # enable building with multiple processes + message(STATUS "Enabling Build with Multiple Processes..") + add_definitions(/MP) endif() endif() From 99bbfa0eb3d51ff95511c66c96937f29748159d6 Mon Sep 17 00:00:00 2001 From: Mordred Date: Thu, 1 Mar 2018 16:31:58 +0100 Subject: [PATCH 2/2] More include stuff --- src/servers/sapphire_zone/Script/Scripts/ScriptObject.h | 4 ---- .../sapphire_zone/Script/Scripts/action/ActionSprint3.cpp | 2 ++ .../sapphire_zone/Script/Scripts/common/Aethernet.cpp | 2 ++ .../sapphire_zone/Script/Scripts/common/Aetheryte.cpp | 3 +++ .../Script/Scripts/common/CmnDefCutSceneReplay.cpp | 2 ++ .../sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp | 2 ++ .../Script/Scripts/common/CmnDefLinkShell.cpp | 2 ++ .../Script/Scripts/common/HouFurOrchestrion.cpp | 2 ++ .../Script/Scripts/instances/dungeons/AlaMhigo.cpp | 1 + .../Script/Scripts/instances/dungeons/AmdaporKeep.cpp | 1 + .../Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp | 1 + .../Script/Scripts/instances/dungeons/BaelsarsWall.cpp | 1 + .../Script/Scripts/instances/dungeons/BardamsMettle.cpp | 1 + .../Scripts/instances/dungeons/BrayfloxsLongstop.cpp | 1 + .../Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp | 1 + .../Script/Scripts/instances/dungeons/CastrumAbania.cpp | 1 + .../Scripts/instances/dungeons/CastrumMeridianum.cpp | 1 + .../Script/Scripts/instances/dungeons/CopperbellMines.cpp | 1 + .../Scripts/instances/dungeons/CopperbellMinesHard.cpp | 1 + .../Script/Scripts/instances/dungeons/CuttersCry.cpp | 1 + .../Script/Scripts/instances/dungeons/DomaCastle.cpp | 1 + .../Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp | 1 + .../Script/Scripts/instances/dungeons/Halatali.cpp | 1 + .../Script/Scripts/instances/dungeons/HalataliHard.cpp | 1 + .../Script/Scripts/instances/dungeons/HaukkeManor.cpp | 1 + .../Script/Scripts/instances/dungeons/HaukkeManorHard.cpp | 1 + .../Script/Scripts/instances/dungeons/HellsLid.cpp | 1 + .../Script/Scripts/instances/dungeons/HullbreakerIsle.cpp | 1 + .../Scripts/instances/dungeons/HullbreakerIsleHard.cpp | 1 + .../Script/Scripts/instances/dungeons/KuganeCastle.cpp | 1 + .../Script/Scripts/instances/dungeons/Neverreap.cpp | 1 + .../Script/Scripts/instances/dungeons/PharosSirius.cpp | 1 + .../Scripts/instances/dungeons/PharosSiriusHard.cpp | 1 + .../instances/dungeons/SaintMociannesArboretum.cpp | 1 + .../Script/Scripts/instances/dungeons/Sastasha.cpp | 1 + .../Script/Scripts/instances/dungeons/SastashaHard.cpp | 1 + .../Scripts/instances/dungeons/ShisuioftheVioletTides.cpp | 1 + .../Script/Scripts/instances/dungeons/Snowcloak.cpp | 1 + .../Script/Scripts/instances/dungeons/SohmAl.cpp | 1 + .../Script/Scripts/instances/dungeons/SohmAlHard.cpp | 1 + .../Script/Scripts/instances/dungeons/SohrKhai.cpp | 1 + .../Script/Scripts/instances/dungeons/TheAery.cpp | 1 + .../dungeons/TheAetherochemicalResearchFacility.cpp | 1 + .../Script/Scripts/instances/dungeons/TheAntitower.cpp | 1 + .../Script/Scripts/instances/dungeons/TheAurumVale.cpp | 1 + .../Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp | 1 + .../Script/Scripts/instances/dungeons/TheDuskVigil.cpp | 1 + .../Scripts/instances/dungeons/TheFractalContinuum.cpp | 1 + .../instances/dungeons/TheFractalContinuumHard.cpp | 1 + .../Scripts/instances/dungeons/TheGreatGubalLibrary.cpp | 1 + .../instances/dungeons/TheGreatGubalLibraryHard.cpp | 1 + .../Scripts/instances/dungeons/TheKeeperoftheLake.cpp | 1 + .../Scripts/instances/dungeons/TheLostCityofAmdapor.cpp | 1 + .../instances/dungeons/TheLostCityofAmdaporHard.cpp | 1 + .../Script/Scripts/instances/dungeons/ThePraetorium.cpp | 1 + .../Script/Scripts/instances/dungeons/TheSirensongSea.cpp | 1 + .../Script/Scripts/instances/dungeons/TheStoneVigil.cpp | 1 + .../Scripts/instances/dungeons/TheStoneVigilHard.cpp | 1 + .../Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp | 1 + .../instances/dungeons/TheSunkenTempleofQarnHard.cpp | 1 + .../Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp | 1 + .../instances/dungeons/TheTamTaraDeepcroftHard.cpp | 1 + .../Scripts/instances/dungeons/TheTempleoftheFist.cpp | 1 + .../instances/dungeons/TheThousandMawsofTotoRak.cpp | 1 + .../Script/Scripts/instances/dungeons/TheVault.cpp | 1 + .../Scripts/instances/dungeons/TheWanderersPalace.cpp | 1 + .../Scripts/instances/dungeons/TheWanderersPalaceHard.cpp | 1 + .../Script/Scripts/instances/dungeons/Xelphatol.cpp | 1 + .../Script/Scripts/instances/events/SpecialEventI.cpp | 1 + .../Script/Scripts/instances/events/SpecialEventII.cpp | 1 + .../Script/Scripts/instances/events/SpecialEventIII.cpp | 1 + .../Script/Scripts/instances/events/TheHauntedManor.cpp | 1 + .../Scripts/instances/events/TheValentionesCeremony.cpp | 1 + .../instances/guildhest/AllsWellthatEndsintheWell.cpp | 1 + .../Script/Scripts/instances/guildhest/AnnoytheVoid.cpp | 1 + .../instances/guildhest/BasicTrainingEnemyParties.cpp | 1 + .../instances/guildhest/BasicTrainingEnemyStrongholds.cpp | 1 + .../instances/guildhest/FlickingSticksandTakingNames.cpp | 1 + .../Scripts/instances/guildhest/HeroontheHalfShell.cpp | 1 + .../Scripts/instances/guildhest/LongLivetheQueen.cpp | 1 + .../Scripts/instances/guildhest/MorethanaFeeler.cpp | 1 + .../Scripts/instances/guildhest/PullingPoisonPosies.cpp | 1 + .../Script/Scripts/instances/guildhest/ShadowandClaw.cpp | 1 + .../Script/Scripts/instances/guildhest/SolemnTrinity.cpp | 1 + .../Script/Scripts/instances/guildhest/StingingBack.cpp | 1 + .../Script/Scripts/instances/guildhest/UndertheArmor.cpp | 1 + .../Script/Scripts/instances/guildhest/WardUp.cpp | 1 + .../hallofthenovice/AccrueEnmityfromMultipleTargets.cpp | 1 + .../hallofthenovice/AssistAlliesinDefeatingaTarget.cpp | 1 + .../hallofthenovice/AvoidAreaofEffectAttacks.cpp | 1 + .../instances/hallofthenovice/AvoidEngagedTargets.cpp | 1 + .../instances/hallofthenovice/DefeatanOccupiedTarget.cpp | 1 + .../hallofthenovice/EngageEnemyReinforcements.cpp | 1 + .../instances/hallofthenovice/EngageMultipleTargets.cpp | 1 + .../instances/hallofthenovice/ExecuteaComboinBattle.cpp | 1 + .../hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp | 1 + .../ExecuteaRangedAttacktoIncreaseEnmity.cpp | 1 + .../Scripts/instances/hallofthenovice/FinalExercise.cpp | 1 + .../instances/hallofthenovice/HealMultipleAllies.cpp | 1 + .../Scripts/instances/hallofthenovice/HealanAlly.cpp | 1 + .../hallofthenovice/InteractwiththeBattlefield.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors101110.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors110.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors111120.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors1120.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors121130.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors131140.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors141150.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors151160.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors161170.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors171180.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors181190.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors191200.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors2130.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors3140.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors4150.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors5160.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors6170.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors7180.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors8190.cpp | 1 + .../instances/potd/ThePalaceoftheDeadFloors91100.cpp | 1 + .../Script/Scripts/instances/pvp/Astragalos.cpp | 1 + .../Script/Scripts/instances/pvp/SealRockSeize.cpp | 1 + .../Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp | 1 + .../Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp | 1 + .../Scripts/instances/pvp/TheFeast4on4LightParty.cpp | 1 + .../Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp | 1 + .../Script/Scripts/instances/pvp/TheFeast4on4Training.cpp | 1 + .../instances/pvp/TheFeastCustomMatchCrystalTower.cpp | 1 + .../instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp | 1 + .../instances/pvp/TheFeastCustomMatchLichenweed.cpp | 1 + .../Script/Scripts/instances/pvp/TheFeastRanked.cpp | 1 + .../Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp | 1 + .../Script/Scripts/instances/pvp/TheFeastTraining.cpp | 1 + .../Scripts/instances/pvp/TheFieldsofGloryShatter.cpp | 1 + .../Scripts/instances/questbattle/ABloodyReunion.cpp | 1 + .../instances/questbattle/ASpectaclefortheAges.cpp | 1 + .../Script/Scripts/instances/questbattle/BloodDragoon.cpp | 1 + .../Scripts/instances/questbattle/BloodontheDeck.cpp | 1 + .../instances/questbattle/CuriousGorgeMeetsHisMatch.cpp | 1 + .../Scripts/instances/questbattle/DarkwingDragon.cpp | 1 + .../Script/Scripts/instances/questbattle/InThalsName.cpp | 1 + .../instances/questbattle/InterdimensionalRift.cpp | 1 + .../Scripts/instances/questbattle/ItsProbablyaTrap.cpp | 1 + .../Scripts/instances/questbattle/MatsubaMayhem.cpp | 1 + .../Script/Scripts/instances/questbattle/Naadam.cpp | 1 + .../Scripts/instances/questbattle/OneLifeforOneWorld.cpp | 1 + .../Scripts/instances/questbattle/OurCompromise.cpp | 1 + .../Scripts/instances/questbattle/OurUnsungHeroes.cpp | 1 + .../Scripts/instances/questbattle/RaisingtheSword.cpp | 1 + .../Scripts/instances/questbattle/ReturnoftheBull.cpp | 1 + .../Scripts/instances/questbattle/TheBattleonBekko.cpp | 1 + .../Scripts/instances/questbattle/TheFaceofTrueEvil.cpp | 1 + .../instances/questbattle/TheHeartoftheProblem.cpp | 1 + .../instances/questbattle/TheOrphansandtheBrokenBlade.cpp | 1 + .../Script/Scripts/instances/questbattle/TheResonant.cpp | 1 + .../Scripts/instances/questbattle/WhenClansCollide.cpp | 1 + .../Scripts/instances/questbattle/WithHeartandSteel.cpp | 1 + .../raids/alexander/AlexanderTheArmoftheFather.cpp | 1 + .../raids/alexander/AlexanderTheArmoftheFatherSavage.cpp | 1 + .../instances/raids/alexander/AlexanderTheArmoftheSon.cpp | 1 + .../raids/alexander/AlexanderTheArmoftheSonSavage.cpp | 1 + .../raids/alexander/AlexanderTheBreathoftheCreator.cpp | 1 + .../alexander/AlexanderTheBreathoftheCreatorSavage.cpp | 1 + .../raids/alexander/AlexanderTheBurdenoftheFather.cpp | 1 + .../alexander/AlexanderTheBurdenoftheFatherSavage.cpp | 1 + .../raids/alexander/AlexanderTheBurdenoftheSon.cpp | 1 + .../raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp | 1 + .../raids/alexander/AlexanderTheCuffoftheFather.cpp | 1 + .../raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp | 1 + .../raids/alexander/AlexanderTheCuffoftheSon.cpp | 1 + .../raids/alexander/AlexanderTheCuffoftheSonSavage.cpp | 1 + .../raids/alexander/AlexanderTheEyesoftheCreator.cpp | 1 + .../alexander/AlexanderTheEyesoftheCreatorSavage.cpp | 1 + .../raids/alexander/AlexanderTheFistoftheFather.cpp | 1 + .../raids/alexander/AlexanderTheFistoftheFatherSavage.cpp | 1 + .../raids/alexander/AlexanderTheFistoftheSon.cpp | 1 + .../raids/alexander/AlexanderTheFistoftheSonSavage.cpp | 1 + .../raids/alexander/AlexanderTheHeartoftheCreator.cpp | 1 + .../alexander/AlexanderTheHeartoftheCreatorSavage.cpp | 1 + .../raids/alexander/AlexanderTheSouloftheCreator.cpp | 1 + .../alexander/AlexanderTheSouloftheCreatorSavage.cpp | 1 + .../raids/coils/TheBindingCoilofBahamutTurn1.cpp | 1 + .../raids/coils/TheBindingCoilofBahamutTurn2.cpp | 1 + .../raids/coils/TheBindingCoilofBahamutTurn3.cpp | 1 + .../raids/coils/TheBindingCoilofBahamutTurn4.cpp | 1 + .../raids/coils/TheBindingCoilofBahamutTurn5.cpp | 1 + .../instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp | 1 + .../instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp | 1 + .../instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp | 1 + .../instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp | 1 + .../raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp | 1 + .../raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp | 1 + .../raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp | 1 + .../raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp | 1 + .../instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp | 1 + .../instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp | 1 + .../instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp | 1 + .../instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp | 1 + .../Scripts/instances/raids/crystaltower/SyrcusTower.cpp | 1 + .../raids/crystaltower/TheLabyrinthoftheAncients.cpp | 1 + .../instances/raids/crystaltower/TheWorldofDarkness.cpp | 1 + .../Scripts/instances/raids/omega/DeltascapeV10.cpp | 1 + .../Scripts/instances/raids/omega/DeltascapeV10Savage.cpp | 1 + .../Scripts/instances/raids/omega/DeltascapeV20.cpp | 1 + .../Scripts/instances/raids/omega/DeltascapeV20Savage.cpp | 1 + .../Scripts/instances/raids/omega/DeltascapeV30.cpp | 1 + .../Scripts/instances/raids/omega/DeltascapeV30Savage.cpp | 1 + .../Scripts/instances/raids/omega/DeltascapeV40.cpp | 1 + .../Scripts/instances/raids/omega/DeltascapeV40Savage.cpp | 1 + .../Scripts/instances/raids/omega/SigmascapeV10.cpp | 1 + .../Scripts/instances/raids/omega/SigmascapeV10Savage.cpp | 1 + .../Scripts/instances/raids/omega/SigmascapeV20.cpp | 1 + .../Scripts/instances/raids/omega/SigmascapeV20Savage.cpp | 1 + .../Scripts/instances/raids/omega/SigmascapeV30.cpp | 1 + .../Scripts/instances/raids/omega/SigmascapeV30Savage.cpp | 1 + .../Scripts/instances/raids/omega/SigmascapeV40.cpp | 1 + .../Scripts/instances/raids/omega/SigmascapeV40Savage.cpp | 1 + .../raids/returntoivalice/TheRoyalCityofRabanastre.cpp | 1 + .../Scripts/instances/raids/shadowofmhach/DunScaith.cpp | 1 + .../Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp | 1 + .../raids/shadowofmhach/TheWeepingCityofMhach.cpp | 1 + .../raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp | 1 + .../Scripts/instances/treasurehunt/TheAquapolis.cpp | 1 + .../instances/treasurehunt/TheHiddenCanalsofUznair.cpp | 1 + .../instances/treasurehunt/TheLostCanalsofUznair.cpp | 1 + .../Scripts/instances/trials/ARelicReborntheChimera.cpp | 1 + .../Scripts/instances/trials/ARelicReborntheHydra.cpp | 1 + .../instances/trials/AkhAfahAmphitheatreExtreme.cpp | 1 + .../Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp | 1 + .../Scripts/instances/trials/BattleintheBigKeep.cpp | 1 + .../Scripts/instances/trials/BattleontheBigBridge.cpp | 1 + .../Script/Scripts/instances/trials/CapeWestwind.cpp | 1 + .../Script/Scripts/instances/trials/Emanation.cpp | 1 + .../Script/Scripts/instances/trials/EmanationExtreme.cpp | 1 + .../Script/Scripts/instances/trials/TheBowlofEmbers.cpp | 1 + .../Scripts/instances/trials/TheBowlofEmbersExtreme.cpp | 1 + .../Scripts/instances/trials/TheBowlofEmbersHard.cpp | 1 + .../Script/Scripts/instances/trials/TheChrysalis.cpp | 1 + .../Script/Scripts/instances/trials/TheDragonsNeck.cpp | 1 + .../Scripts/instances/trials/TheFinalStepsofFaith.cpp | 1 + .../Script/Scripts/instances/trials/TheHowlingEye.cpp | 1 + .../Scripts/instances/trials/TheHowlingEyeExtreme.cpp | 1 + .../Script/Scripts/instances/trials/TheHowlingEyeHard.cpp | 1 + .../Scripts/instances/trials/TheLimitlessBlueExtreme.cpp | 1 + .../Scripts/instances/trials/TheLimitlessBlueHard.cpp | 1 + .../instances/trials/TheMinstrelsBalladNidhoggsRage.cpp | 1 + .../instances/trials/TheMinstrelsBalladShinryusDomain.cpp | 1 + .../instances/trials/TheMinstrelsBalladThordansReign.cpp | 1 + .../instances/trials/TheMinstrelsBalladUltimasBane.cpp | 1 + .../Script/Scripts/instances/trials/TheNavel.cpp | 1 + .../Script/Scripts/instances/trials/TheNavelExtreme.cpp | 1 + .../Script/Scripts/instances/trials/TheNavelHard.cpp | 1 + .../Script/Scripts/instances/trials/ThePoolofTribute.cpp | 1 + .../Scripts/instances/trials/ThePoolofTributeExtreme.cpp | 1 + .../Script/Scripts/instances/trials/TheRoyalMenagerie.cpp | 1 + .../Scripts/instances/trials/TheSingularityReactor.cpp | 1 + .../Script/Scripts/instances/trials/TheStepsofFaith.cpp | 1 + .../Scripts/instances/trials/TheStrikingTreeExtreme.cpp | 1 + .../Scripts/instances/trials/TheStrikingTreeHard.cpp | 1 + .../Scripts/instances/trials/TheWhorleaterExtreme.cpp | 1 + .../Script/Scripts/instances/trials/TheWhorleaterHard.cpp | 1 + .../Scripts/instances/trials/ThokastThokExtreme.cpp | 1 + .../Script/Scripts/instances/trials/ThokastThokHard.cpp | 1 + .../Script/Scripts/instances/trials/ThornmarchExtreme.cpp | 1 + .../Script/Scripts/instances/trials/ThornmarchHard.cpp | 1 + .../Script/Scripts/instances/trials/UrthsFount.cpp | 1 + .../Scripts/instances/trials/thefourlords/TheJadeStoa.cpp | 1 + .../instances/trials/thefourlords/TheJadeStoaExtreme.cpp | 1 + .../instances/trials/warringtriad/ContainmentBayP1T6.cpp | 1 + .../trials/warringtriad/ContainmentBayP1T6Extreme.cpp | 1 + .../instances/trials/warringtriad/ContainmentBayS1T7.cpp | 1 + .../trials/warringtriad/ContainmentBayS1T7Extreme.cpp | 1 + .../instances/trials/warringtriad/ContainmentBayZ1T9.cpp | 1 + .../trials/warringtriad/ContainmentBayZ1T9Extreme.cpp | 1 + .../Script/Scripts/opening/OpeningGridania.cpp | 2 ++ .../sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp | 2 ++ .../sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp | 2 ++ .../sapphire_zone/Script/Scripts/quest/ManFst001.cpp | 3 +++ .../sapphire_zone/Script/Scripts/quest/ManFst002.cpp | 3 +++ .../sapphire_zone/Script/Scripts/quest/ManFst003.cpp | 3 +++ .../sapphire_zone/Script/Scripts/quest/ManFst004.cpp | 8 +++----- .../sapphire_zone/Script/Scripts/quest/ManSea001.cpp | 3 +++ .../sapphire_zone/Script/Scripts/quest/ManSea002.cpp | 3 +++ .../sapphire_zone/Script/Scripts/quest/ManWil001.cpp | 3 +++ .../sapphire_zone/Script/Scripts/quest/ManWil002.cpp | 3 +++ .../Script/Scripts/quest/subquest/gridania/SubFst001.cpp | 3 +++ .../Script/Scripts/quest/subquest/gridania/SubFst002.cpp | 3 +++ .../Script/Scripts/quest/subquest/gridania/SubFst010.cpp | 3 +++ .../Script/Scripts/quest/subquest/gridania/SubFst013.cpp | 3 +++ 290 files changed, 324 insertions(+), 9 deletions(-) diff --git a/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h b/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h index 3848b55c..fd0c8537 100644 --- a/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h +++ b/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h @@ -1,11 +1,7 @@ #ifndef SAPPHIRE_SCRIPTOBJECT_H #define SAPPHIRE_SCRIPTOBJECT_H -#include