From 6f84e9ef41e603c303f06b4b8b3d90a571bbf246 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 8 Feb 2018 23:28:52 +1100 Subject: [PATCH] restructure script folder hierachy to remove unnecessary build targets --- .../Script/Scripts/{aetheryte => common}/Aethernet.cpp | 0 .../Script/Scripts/{aetheryte => common}/Aetheryte.cpp | 0 .../Script/Scripts/{CmnDef => common}/CmnDefCutSceneReplay.cpp | 0 .../Script/Scripts/{CmnDef => common}/CmnDefInnBed.cpp | 0 .../Script/Scripts/{CmnDef => common}/CmnDefLinkShell.cpp | 0 .../Script/Scripts/{CmnDef => common}/HouFurOrchestrion.cpp | 0 .../Script/Scripts/{ => quest}/opening/OpeningGridania.cpp | 2 +- .../Script/Scripts/{ => quest}/opening/OpeningLimsa.cpp | 2 +- .../Script/Scripts/{ => quest}/opening/OpeningUldah.cpp | 2 +- src/servers/sapphire_zone/Zone/InstanceContent.cpp | 1 + src/servers/sapphire_zone/Zone/InstanceContent.h | 2 ++ 11 files changed, 6 insertions(+), 3 deletions(-) rename src/servers/sapphire_zone/Script/Scripts/{aetheryte => common}/Aethernet.cpp (100%) rename src/servers/sapphire_zone/Script/Scripts/{aetheryte => common}/Aetheryte.cpp (100%) rename src/servers/sapphire_zone/Script/Scripts/{CmnDef => common}/CmnDefCutSceneReplay.cpp (100%) rename src/servers/sapphire_zone/Script/Scripts/{CmnDef => common}/CmnDefInnBed.cpp (100%) rename src/servers/sapphire_zone/Script/Scripts/{CmnDef => common}/CmnDefLinkShell.cpp (100%) rename src/servers/sapphire_zone/Script/Scripts/{CmnDef => common}/HouFurOrchestrion.cpp (100%) rename src/servers/sapphire_zone/Script/Scripts/{ => quest}/opening/OpeningGridania.cpp (99%) rename src/servers/sapphire_zone/Script/Scripts/{ => quest}/opening/OpeningLimsa.cpp (99%) rename src/servers/sapphire_zone/Script/Scripts/{ => quest}/opening/OpeningUldah.cpp (99%) diff --git a/src/servers/sapphire_zone/Script/Scripts/aetheryte/Aethernet.cpp b/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp similarity index 100% rename from src/servers/sapphire_zone/Script/Scripts/aetheryte/Aethernet.cpp rename to src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp diff --git a/src/servers/sapphire_zone/Script/Scripts/aetheryte/Aetheryte.cpp b/src/servers/sapphire_zone/Script/Scripts/common/Aetheryte.cpp similarity index 100% rename from src/servers/sapphire_zone/Script/Scripts/aetheryte/Aetheryte.cpp rename to src/servers/sapphire_zone/Script/Scripts/common/Aetheryte.cpp diff --git a/src/servers/sapphire_zone/Script/Scripts/CmnDef/CmnDefCutSceneReplay.cpp b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefCutSceneReplay.cpp similarity index 100% rename from src/servers/sapphire_zone/Script/Scripts/CmnDef/CmnDefCutSceneReplay.cpp rename to src/servers/sapphire_zone/Script/Scripts/common/CmnDefCutSceneReplay.cpp diff --git a/src/servers/sapphire_zone/Script/Scripts/CmnDef/CmnDefInnBed.cpp b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp similarity index 100% rename from src/servers/sapphire_zone/Script/Scripts/CmnDef/CmnDefInnBed.cpp rename to src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp diff --git a/src/servers/sapphire_zone/Script/Scripts/CmnDef/CmnDefLinkShell.cpp b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefLinkShell.cpp similarity index 100% rename from src/servers/sapphire_zone/Script/Scripts/CmnDef/CmnDefLinkShell.cpp rename to src/servers/sapphire_zone/Script/Scripts/common/CmnDefLinkShell.cpp diff --git a/src/servers/sapphire_zone/Script/Scripts/CmnDef/HouFurOrchestrion.cpp b/src/servers/sapphire_zone/Script/Scripts/common/HouFurOrchestrion.cpp similarity index 100% rename from src/servers/sapphire_zone/Script/Scripts/CmnDef/HouFurOrchestrion.cpp rename to src/servers/sapphire_zone/Script/Scripts/common/HouFurOrchestrion.cpp diff --git a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningGridania.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningGridania.cpp similarity index 99% rename from src/servers/sapphire_zone/Script/Scripts/opening/OpeningGridania.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningGridania.cpp index 9f6d6f0a..1541561c 100644 --- a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningGridania.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningGridania.cpp @@ -1,4 +1,4 @@ -#include "../ScriptObject.h" +#include class OpeningGridania : public EventScript { diff --git a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningLimsa.cpp similarity index 99% rename from src/servers/sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningLimsa.cpp index a40ea482..f30a2aed 100644 --- a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningLimsa.cpp @@ -1,4 +1,4 @@ -#include "../ScriptObject.h" +#include // Opening Script: OpeningLimsaLominsa // Quest Name: OpeningLimsaLominsa diff --git a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningUldah.cpp similarity index 99% rename from src/servers/sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp rename to src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningUldah.cpp index fdd1c5d2..c780782e 100644 --- a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp +++ b/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningUldah.cpp @@ -1,4 +1,4 @@ -#include "../ScriptObject.h" +#include class OpeningUldah : public EventScript { diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp index 48f8fac9..6e9d689f 100644 --- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp +++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp @@ -31,6 +31,7 @@ Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceC m_instanceContentId( instanceContentId ), m_state( Created ) { + m_instanceExpireTime = Util::getTimeSeconds() + ( m_instanceContentInfo->timeLimitmin * 60u ); } Core::InstanceContent::~InstanceContent() diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h index 49bfedf7..23d873f7 100644 --- a/src/servers/sapphire_zone/Zone/InstanceContent.h +++ b/src/servers/sapphire_zone/Zone/InstanceContent.h @@ -46,6 +46,8 @@ private: uint32_t m_instanceContentId; InstanceContentState m_state; + int64_t m_instanceExpireTime; + }; }