From dc53c45d65c3aa1538b469b93837239b37e648d5 Mon Sep 17 00:00:00 2001 From: EmosewaMC <39972741+EmosewaMC@users.noreply.github.com> Date: Wed, 22 Jun 2022 22:19:49 -0700 Subject: [PATCH] C Scripts and remove unneeded includes from base cppscripts header Remove the MissionComponent and Loot includes from all base scripts and place their needed includes in the respective scripts. --- dGame/dComponents/PropertyManagementComponent.cpp | 1 + dGame/dComponents/RebuildComponent.cpp | 2 ++ dGame/dMission/MissionState.h | 5 +++++ dScripts/ActSharkPlayerDeathTrigger.cpp | 2 ++ dScripts/AgPropGuard.cpp | 1 + dScripts/BasePropertyServer.cpp | 1 + dScripts/BaseSurvivalServer.cpp | 2 ++ dScripts/BaseWavesServer.cpp | 2 ++ dScripts/BootyDigServer.cpp | 2 ++ dScripts/CatapultBaseServer.cpp | 2 -- dScripts/CatapultBaseServer.h | 3 --- dScripts/CatapultBouncerServer.cpp | 1 - dScripts/CatapultBouncerServer.h | 3 --- dScripts/CavePrisonCage.cpp | 2 +- dScripts/CavePrisonCage.h | 3 --- dScripts/ChooseYourDestinationNsToNt.cpp | 2 -- dScripts/ChooseYourDestinationNsToNt.h | 1 - dScripts/ClRing.cpp | 2 -- dScripts/CppScripts.cpp | 2 -- dScripts/CppScripts.h | 2 -- dScripts/ExplodingAsset.cpp | 2 ++ dScripts/FvBounceOverWall.cpp | 1 + dScripts/FvFreeGfNinjas.cpp | 1 + dScripts/FvPassThroughWall.cpp | 1 + dScripts/FvRaceSmashEggImagineServer.cpp | 2 ++ dScripts/GfTikiTorch.cpp | 3 ++- dScripts/ImaginationBackpackHealServer.cpp | 1 + dScripts/LegoDieRoll.cpp | 1 + dScripts/NpcAgCourseStarter.cpp | 1 + dScripts/NpcNjAssistantServer.cpp | 1 + dScripts/NpcNpSpacemanBob.cpp | 1 + dScripts/NsConcertInstrument.cpp | 1 + dScripts/NsConcertQuickBuild.cpp | 1 + dScripts/NsJohnnyMissionServer.cpp | 1 + dScripts/NsModularBuild.cpp | 1 + dScripts/NtAssemblyTubeServer.cpp | 1 + dScripts/NtDukeServer.cpp | 1 + dScripts/NtFactionSpyServer.cpp | 1 + dScripts/NtParadoxTeleServer.cpp | 1 + dScripts/NtSentinelWalkwayServer.cpp | 1 + dScripts/PetDigBuild.cpp | 1 + dScripts/PropertyDevice.cpp | 1 + dScripts/RaceImagineCrateServer.cpp | 1 + dScripts/RaceImaginePowerup.cpp | 2 +- dScripts/RaceSmashServer.cpp | 1 + dScripts/SGCannon.cpp | 1 + dScripts/SpawnGryphonServer.cpp | 1 + dScripts/SsModularBuildServer.cpp | 1 + dScripts/VeBricksampleServer.cpp | 1 + dScripts/ZoneAgProperty.cpp | 1 + 50 files changed, 52 insertions(+), 24 deletions(-) diff --git a/dGame/dComponents/PropertyManagementComponent.cpp b/dGame/dComponents/PropertyManagementComponent.cpp index 7f82ae27c..317716a98 100644 --- a/dGame/dComponents/PropertyManagementComponent.cpp +++ b/dGame/dComponents/PropertyManagementComponent.cpp @@ -2,6 +2,7 @@ #include +#include "MissionComponent.h" #include "EntityManager.h" #include "PropertyDataMessage.h" #include "UserManager.h" diff --git a/dGame/dComponents/RebuildComponent.cpp b/dGame/dComponents/RebuildComponent.cpp index 5e313a7a6..603a18cc0 100644 --- a/dGame/dComponents/RebuildComponent.cpp +++ b/dGame/dComponents/RebuildComponent.cpp @@ -6,6 +6,8 @@ #include "Game.h" #include "dLogger.h" #include "CharacterComponent.h" +#include "MissionComponent.h" +#include "MissionTaskType.h" #include "dServer.h" #include "PacketUtils.h" diff --git a/dGame/dMission/MissionState.h b/dGame/dMission/MissionState.h index 161a40217..c189c7089 100644 --- a/dGame/dMission/MissionState.h +++ b/dGame/dMission/MissionState.h @@ -1,5 +1,8 @@ #pragma once +#ifndef __MISSIONSTATE__H__ +#define __MISSIONSTATE__H__ + /** * Represents the possible states a mission can be in */ @@ -49,3 +52,5 @@ enum class MissionState : int { */ MISSION_STATE_COMPLETE_READY_TO_COMPLETE = 12 }; + +#endif //!__MISSIONSTATE__H__ diff --git a/dScripts/ActSharkPlayerDeathTrigger.cpp b/dScripts/ActSharkPlayerDeathTrigger.cpp index fa111c71a..a8aaac8b9 100644 --- a/dScripts/ActSharkPlayerDeathTrigger.cpp +++ b/dScripts/ActSharkPlayerDeathTrigger.cpp @@ -1,4 +1,6 @@ #include "ActSharkPlayerDeathTrigger.h" +#include "MissionComponent.h" +#include "MissionTaskType.h" #include "Entity.h" void ActSharkPlayerDeathTrigger::OnFireEventServerSide(Entity *self, Entity *sender, std::string args, int32_t param1, diff --git a/dScripts/AgPropGuard.cpp b/dScripts/AgPropGuard.cpp index 24e067222..b05eef4fc 100644 --- a/dScripts/AgPropGuard.cpp +++ b/dScripts/AgPropGuard.cpp @@ -3,6 +3,7 @@ #include "Character.h" #include "EntityManager.h" #include "InventoryComponent.h" +#include "MissionComponent.h" #include "Item.h" void AgPropGuard::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) diff --git a/dScripts/BasePropertyServer.cpp b/dScripts/BasePropertyServer.cpp index faeb5bfac..e7a958445 100644 --- a/dScripts/BasePropertyServer.cpp +++ b/dScripts/BasePropertyServer.cpp @@ -7,6 +7,7 @@ #include "Entity.h" #include "RenderComponent.h" #include "PropertyManagementComponent.h" +#include "MissionComponent.h" void BasePropertyServer::SetGameVariables(Entity *self) { self->SetVar(ClaimMarkerGroup, ""); diff --git a/dScripts/BaseSurvivalServer.cpp b/dScripts/BaseSurvivalServer.cpp index dd9b93656..f6a326e8d 100644 --- a/dScripts/BaseSurvivalServer.cpp +++ b/dScripts/BaseSurvivalServer.cpp @@ -4,6 +4,8 @@ #include "EntityManager.h" #include "dZoneManager.h" #include "Player.h" +#include "MissionTaskType.h" +#include "MissionComponent.h" #include "Character.h" void BaseSurvivalServer::SetGameVariables(Entity *self) { diff --git a/dScripts/BaseWavesServer.cpp b/dScripts/BaseWavesServer.cpp index ac8da8a76..940a9083e 100644 --- a/dScripts/BaseWavesServer.cpp +++ b/dScripts/BaseWavesServer.cpp @@ -4,6 +4,8 @@ #include "EntityManager.h" #include "dZoneManager.h" #include "Player.h" +#include "MissionTaskType.h" +#include "MissionComponent.h" #include "Character.h" // Done diff --git a/dScripts/BootyDigServer.cpp b/dScripts/BootyDigServer.cpp index eeb3bfd44..50d873e07 100644 --- a/dScripts/BootyDigServer.cpp +++ b/dScripts/BootyDigServer.cpp @@ -1,6 +1,8 @@ #include "BootyDigServer.h" #include "EntityManager.h" #include "RenderComponent.h" +#include "MissionComponent.h" +#include "MissionTaskType.h" void BootyDigServer::OnStartup(Entity *self) { auto* zoneControlObject = EntityManager::Instance()->GetZoneControlEntity(); diff --git a/dScripts/CatapultBaseServer.cpp b/dScripts/CatapultBaseServer.cpp index 81db8abd6..33539de8f 100644 --- a/dScripts/CatapultBaseServer.cpp +++ b/dScripts/CatapultBaseServer.cpp @@ -1,8 +1,6 @@ #include "CatapultBaseServer.h" #include "GameMessages.h" #include "EntityManager.h" -#include "dZoneManager.h" - void CatapultBaseServer::OnNotifyObject(Entity *self, Entity *sender, const std::string& name, int32_t param1, int32_t param2) { diff --git a/dScripts/CatapultBaseServer.h b/dScripts/CatapultBaseServer.h index ad9490220..a174fcaf6 100644 --- a/dScripts/CatapultBaseServer.h +++ b/dScripts/CatapultBaseServer.h @@ -1,8 +1,5 @@ #pragma once #include "CppScripts.h" -#include "Spawner.h" -#include "dZoneManager.h" -#include "dCommonVars.h" class CatapultBaseServer : public CppScripts::Script { public: diff --git a/dScripts/CatapultBouncerServer.cpp b/dScripts/CatapultBouncerServer.cpp index 0952a7ffc..098f38ac2 100644 --- a/dScripts/CatapultBouncerServer.cpp +++ b/dScripts/CatapultBouncerServer.cpp @@ -1,7 +1,6 @@ #include "CatapultBouncerServer.h" #include "GameMessages.h" #include "EntityManager.h" -#include "dZoneManager.h" void CatapultBouncerServer::OnRebuildComplete(Entity* self, Entity* target) { diff --git a/dScripts/CatapultBouncerServer.h b/dScripts/CatapultBouncerServer.h index 1178a46ff..06f03bf42 100644 --- a/dScripts/CatapultBouncerServer.h +++ b/dScripts/CatapultBouncerServer.h @@ -1,8 +1,5 @@ #pragma once #include "CppScripts.h" -#include "Spawner.h" -#include "dZoneManager.h" -#include "dCommonVars.h" class CatapultBouncerServer : public CppScripts::Script { public: diff --git a/dScripts/CavePrisonCage.cpp b/dScripts/CavePrisonCage.cpp index 793050b3d..5fe47f2de 100644 --- a/dScripts/CavePrisonCage.cpp +++ b/dScripts/CavePrisonCage.cpp @@ -1,9 +1,9 @@ #include "CavePrisonCage.h" #include "EntityManager.h" #include "RebuildComponent.h" -#include "MovingPlatformComponent.h" #include "GameMessages.h" #include "Character.h" +#include "dZoneManager.h" void CavePrisonCage::OnStartup(Entity *self) { diff --git a/dScripts/CavePrisonCage.h b/dScripts/CavePrisonCage.h index 47f95a984..5ae357d5a 100644 --- a/dScripts/CavePrisonCage.h +++ b/dScripts/CavePrisonCage.h @@ -1,8 +1,5 @@ #pragma once #include "CppScripts.h" -#include "Spawner.h" -#include "dZoneManager.h" -#include "dCommonVars.h" class CavePrisonCage : public CppScripts::Script { public: diff --git a/dScripts/ChooseYourDestinationNsToNt.cpp b/dScripts/ChooseYourDestinationNsToNt.cpp index 2ed8ebdcd..823d7c854 100644 --- a/dScripts/ChooseYourDestinationNsToNt.cpp +++ b/dScripts/ChooseYourDestinationNsToNt.cpp @@ -1,8 +1,6 @@ #include "ChooseYourDestinationNsToNt.h" #include "Character.h" #include "GameMessages.h" -#include "dZoneManager.h" -#include "EntityManager.h" bool ChooseYourDestinationNsToNt::CheckChoice(Entity* self, Entity* player) { diff --git a/dScripts/ChooseYourDestinationNsToNt.h b/dScripts/ChooseYourDestinationNsToNt.h index 7a02b38b9..cbf3709eb 100644 --- a/dScripts/ChooseYourDestinationNsToNt.h +++ b/dScripts/ChooseYourDestinationNsToNt.h @@ -1,5 +1,4 @@ #pragma once -#include "CppScripts.h" class ChooseYourDestinationNsToNt { diff --git a/dScripts/ClRing.cpp b/dScripts/ClRing.cpp index 5b2910d32..5de3e6833 100644 --- a/dScripts/ClRing.cpp +++ b/dScripts/ClRing.cpp @@ -1,6 +1,4 @@ #include "ClRing.h" -#include "EntityManager.h" -#include "Character.h" void ClRing::OnCollisionPhantom(Entity* self, Entity* target) { diff --git a/dScripts/CppScripts.cpp b/dScripts/CppScripts.cpp index 9e402a218..f9831ef49 100644 --- a/dScripts/CppScripts.cpp +++ b/dScripts/CppScripts.cpp @@ -4,10 +4,8 @@ #include "CppScripts.h" #include "GameMessages.h" -#include "dpWorld.h" #include "Entity.h" #include "ScriptComponent.h" -#include "EntityManager.h" #include "Game.h" #include "dLogger.h" #include "InvalidScript.h" diff --git a/dScripts/CppScripts.h b/dScripts/CppScripts.h index 7ffa87343..65f42b2fe 100644 --- a/dScripts/CppScripts.h +++ b/dScripts/CppScripts.h @@ -1,9 +1,7 @@ #pragma once #include "dCommonVars.h" #include -#include "MissionComponent.h" #include "MissionState.h" -#include "Loot.h" class User; class Entity; diff --git a/dScripts/ExplodingAsset.cpp b/dScripts/ExplodingAsset.cpp index 929d20827..bb2f5e03a 100644 --- a/dScripts/ExplodingAsset.cpp +++ b/dScripts/ExplodingAsset.cpp @@ -2,6 +2,8 @@ #include "DestroyableComponent.h" #include "GameMessages.h" +#include "MissionComponent.h" +#include "MissionTaskType.h" #include "SkillComponent.h" //TODO: this has to be updated so that you only get killed if you're in a certain radius. diff --git a/dScripts/FvBounceOverWall.cpp b/dScripts/FvBounceOverWall.cpp index 348bc36c2..1c85ffbd6 100644 --- a/dScripts/FvBounceOverWall.cpp +++ b/dScripts/FvBounceOverWall.cpp @@ -1,4 +1,5 @@ #include "FvBounceOverWall.h" +#include "MissionComponent.h" void FvBounceOverWall::OnCollisionPhantom(Entity* self, Entity* target) { auto missionComponent = target->GetComponent(); diff --git a/dScripts/FvFreeGfNinjas.cpp b/dScripts/FvFreeGfNinjas.cpp index 0d749b01a..8022b32f4 100644 --- a/dScripts/FvFreeGfNinjas.cpp +++ b/dScripts/FvFreeGfNinjas.cpp @@ -1,5 +1,6 @@ #include "FvFreeGfNinjas.h" #include "Character.h" +#include "MissionComponent.h" void FvFreeGfNinjas::OnMissionDialogueOK(Entity *self, Entity *target, int missionID, MissionState missionState) { if (missionID == 705 && missionState == MissionState::MISSION_STATE_AVAILABLE) { diff --git a/dScripts/FvPassThroughWall.cpp b/dScripts/FvPassThroughWall.cpp index 66130a9f8..e894f923e 100644 --- a/dScripts/FvPassThroughWall.cpp +++ b/dScripts/FvPassThroughWall.cpp @@ -1,5 +1,6 @@ #include "FvPassThroughWall.h" #include "InventoryComponent.h" +#include "MissionComponent.h" void FvPassThroughWall::OnCollisionPhantom(Entity* self, Entity* target) { auto missionComponent = target->GetComponent(); diff --git a/dScripts/FvRaceSmashEggImagineServer.cpp b/dScripts/FvRaceSmashEggImagineServer.cpp index 8e0d0897c..e198a8303 100644 --- a/dScripts/FvRaceSmashEggImagineServer.cpp +++ b/dScripts/FvRaceSmashEggImagineServer.cpp @@ -4,6 +4,8 @@ #include "FvRaceSmashEggImagineServer.h" #include "PossessableComponent.h" #include "RacingTaskParam.h" +#include "MissionComponent.h" +#include "MissionTaskType.h" void FvRaceSmashEggImagineServer::OnDie(Entity *self, Entity *killer) { if (killer != nullptr) { diff --git a/dScripts/GfTikiTorch.cpp b/dScripts/GfTikiTorch.cpp index d0e5d58dc..d172b12b8 100644 --- a/dScripts/GfTikiTorch.cpp +++ b/dScripts/GfTikiTorch.cpp @@ -1,7 +1,8 @@ #include "GfTikiTorch.h" #include "GameMessages.h" #include "EntityManager.h" - +#include "MissionComponent.h" +#include "MissionTaskType.h" #include "RenderComponent.h" void GfTikiTorch::OnStartup(Entity* self) { diff --git a/dScripts/ImaginationBackpackHealServer.cpp b/dScripts/ImaginationBackpackHealServer.cpp index 3f572a8fb..1d7da2c54 100644 --- a/dScripts/ImaginationBackpackHealServer.cpp +++ b/dScripts/ImaginationBackpackHealServer.cpp @@ -1,5 +1,6 @@ #include "ImaginationBackpackHealServer.h" #include "GameMessages.h" +#include "MissionComponent.h" void ImaginationBackpackHealServer::OnSkillEventFired(Entity *self, Entity *caster, const std::string &message) { if (message == "CastImaginationBackpack") { diff --git a/dScripts/LegoDieRoll.cpp b/dScripts/LegoDieRoll.cpp index 4b375a38e..520cbf5ef 100644 --- a/dScripts/LegoDieRoll.cpp +++ b/dScripts/LegoDieRoll.cpp @@ -2,6 +2,7 @@ #include "Entity.h" #include "dLogger.h" #include "GameMessages.h" +#include "MissionComponent.h" void LegoDieRoll::OnStartup(Entity* self) { self->AddTimer("DoneRolling", 10.0f); diff --git a/dScripts/NpcAgCourseStarter.cpp b/dScripts/NpcAgCourseStarter.cpp index 4e6dd5c5f..953cd2434 100644 --- a/dScripts/NpcAgCourseStarter.cpp +++ b/dScripts/NpcAgCourseStarter.cpp @@ -6,6 +6,7 @@ #include "LeaderboardManager.h" #include "Game.h" #include "dLogger.h" +#include "MissionComponent.h" #include void NpcAgCourseStarter::OnStartup(Entity* self) { diff --git a/dScripts/NpcNjAssistantServer.cpp b/dScripts/NpcNjAssistantServer.cpp index 7ff21c8e1..b97437561 100644 --- a/dScripts/NpcNjAssistantServer.cpp +++ b/dScripts/NpcNjAssistantServer.cpp @@ -1,6 +1,7 @@ #include "NpcNjAssistantServer.h" #include "GameMessages.h" #include "InventoryComponent.h" +#include "MissionComponent.h" #include "Item.h" void NpcNjAssistantServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) { diff --git a/dScripts/NpcNpSpacemanBob.cpp b/dScripts/NpcNpSpacemanBob.cpp index 2893e0396..fc1765aaf 100644 --- a/dScripts/NpcNpSpacemanBob.cpp +++ b/dScripts/NpcNpSpacemanBob.cpp @@ -4,6 +4,7 @@ #include "GameMessages.h" #include "MissionState.h" #include "Game.h" +#include "MissionComponent.h" #include "dLogger.h" void NpcNpSpacemanBob::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) diff --git a/dScripts/NsConcertInstrument.cpp b/dScripts/NsConcertInstrument.cpp index bfd35083f..a449a6a44 100644 --- a/dScripts/NsConcertInstrument.cpp +++ b/dScripts/NsConcertInstrument.cpp @@ -5,6 +5,7 @@ #include "EntityManager.h" #include "RebuildComponent.h" #include "SoundTriggerComponent.h" +#include "MissionComponent.h" // Constants are at the bottom diff --git a/dScripts/NsConcertQuickBuild.cpp b/dScripts/NsConcertQuickBuild.cpp index 6bf501c49..eadbe3d1e 100644 --- a/dScripts/NsConcertQuickBuild.cpp +++ b/dScripts/NsConcertQuickBuild.cpp @@ -5,6 +5,7 @@ #include "RenderComponent.h" #include "GameMessages.h" #include "MovingPlatformComponent.h" +#include "MissionComponent.h" const float NsConcertQuickBuild::resetTime = 40.0f; const float NsConcertQuickBuild::resetBlinkTime = 6.0f; diff --git a/dScripts/NsJohnnyMissionServer.cpp b/dScripts/NsJohnnyMissionServer.cpp index 435f50c81..6fc73a825 100644 --- a/dScripts/NsJohnnyMissionServer.cpp +++ b/dScripts/NsJohnnyMissionServer.cpp @@ -1,4 +1,5 @@ #include "NsJohnnyMissionServer.h" +#include "MissionComponent.h" void NsJohnnyMissionServer::OnMissionDialogueOK(Entity *self, Entity *target, int missionID, MissionState missionState) { if (missionID == 773 && missionState <= MissionState::MISSION_STATE_ACTIVE) { diff --git a/dScripts/NsModularBuild.cpp b/dScripts/NsModularBuild.cpp index 09d3d6958..01e48045a 100644 --- a/dScripts/NsModularBuild.cpp +++ b/dScripts/NsModularBuild.cpp @@ -1,6 +1,7 @@ #include "NsModularBuild.h" #include "EntityManager.h" #include "Character.h" +#include "MissionComponent.h" void NsModularBuild::OnModularBuildExit(Entity* self, Entity* player, bool bCompleted, std::vector modules) { if (bCompleted) { diff --git a/dScripts/NtAssemblyTubeServer.cpp b/dScripts/NtAssemblyTubeServer.cpp index 5f05f54e5..7859c9007 100644 --- a/dScripts/NtAssemblyTubeServer.cpp +++ b/dScripts/NtAssemblyTubeServer.cpp @@ -4,6 +4,7 @@ #include "EntityManager.h" #include "SkillComponent.h" #include "DestroyableComponent.h" +#include "MissionComponent.h" void NtAssemblyTubeServer::OnStartup(Entity* self) { diff --git a/dScripts/NtDukeServer.cpp b/dScripts/NtDukeServer.cpp index fe196811d..df3f39d66 100644 --- a/dScripts/NtDukeServer.cpp +++ b/dScripts/NtDukeServer.cpp @@ -1,5 +1,6 @@ #include "NtDukeServer.h" #include "InventoryComponent.h" +#include "MissionComponent.h" void NtDukeServer::SetVariables(Entity *self) { self->SetVar(m_SpyProximityVariable, 35.0f); diff --git a/dScripts/NtFactionSpyServer.cpp b/dScripts/NtFactionSpyServer.cpp index b99990c0a..f1104e342 100644 --- a/dScripts/NtFactionSpyServer.cpp +++ b/dScripts/NtFactionSpyServer.cpp @@ -3,6 +3,7 @@ #include "ProximityMonitorComponent.h" #include "InventoryComponent.h" #include "GameMessages.h" +#include "MissionComponent.h" void NtFactionSpyServer::OnStartup(Entity *self) { SetVariables(self); diff --git a/dScripts/NtParadoxTeleServer.cpp b/dScripts/NtParadoxTeleServer.cpp index 41d21cb7e..9427ee2eb 100644 --- a/dScripts/NtParadoxTeleServer.cpp +++ b/dScripts/NtParadoxTeleServer.cpp @@ -4,6 +4,7 @@ #include "EntityManager.h" #include "SkillComponent.h" #include "DestroyableComponent.h" +#include "MissionComponent.h" void NtParadoxTeleServer::OnStartup(Entity* self) { diff --git a/dScripts/NtSentinelWalkwayServer.cpp b/dScripts/NtSentinelWalkwayServer.cpp index efd30cc60..dec0d50bf 100644 --- a/dScripts/NtSentinelWalkwayServer.cpp +++ b/dScripts/NtSentinelWalkwayServer.cpp @@ -2,6 +2,7 @@ #include "PhantomPhysicsComponent.h" #include "EntityManager.h" #include "dLogger.h" +#include "MissionComponent.h" void NtSentinelWalkwayServer::OnStartup(Entity* self) { diff --git a/dScripts/PetDigBuild.cpp b/dScripts/PetDigBuild.cpp index 31b3db061..7ff88fff0 100644 --- a/dScripts/PetDigBuild.cpp +++ b/dScripts/PetDigBuild.cpp @@ -1,5 +1,6 @@ #include "PetDigBuild.h" #include "EntityManager.h" +#include "MissionComponent.h" void PetDigBuild::OnRebuildComplete(Entity* self, Entity* target) { auto flagNumber = self->GetVar(u"flagNum"); diff --git a/dScripts/PropertyDevice.cpp b/dScripts/PropertyDevice.cpp index 6d8e2c0a9..ed0d7b81c 100644 --- a/dScripts/PropertyDevice.cpp +++ b/dScripts/PropertyDevice.cpp @@ -1,6 +1,7 @@ #include "PropertyDevice.h" #include "GameMessages.h" #include "EntityManager.h" +#include "MissionComponent.h" void PropertyDevice::OnStartup(Entity *self) { auto* zoneControl = EntityManager::Instance()->GetZoneControlEntity(); diff --git a/dScripts/RaceImagineCrateServer.cpp b/dScripts/RaceImagineCrateServer.cpp index 166b33632..480924300 100644 --- a/dScripts/RaceImagineCrateServer.cpp +++ b/dScripts/RaceImagineCrateServer.cpp @@ -5,6 +5,7 @@ #include "PossessableComponent.h" #include "RaceImagineCrateServer.h" #include "RacingTaskParam.h" +#include "MissionComponent.h" #include "SkillComponent.h" void RaceImagineCrateServer::OnDie(Entity* self, Entity* killer) diff --git a/dScripts/RaceImaginePowerup.cpp b/dScripts/RaceImaginePowerup.cpp index 43e20e9d9..78438b2f5 100644 --- a/dScripts/RaceImaginePowerup.cpp +++ b/dScripts/RaceImaginePowerup.cpp @@ -5,7 +5,7 @@ #include "PossessorComponent.h" #include "RaceImaginePowerup.h" #include "RacingTaskParam.h" - +#include "MissionComponent.h" void RaceImaginePowerup::OnFireEventServerSide(Entity *self, Entity *sender, std::string args, int32_t param1, int32_t param2, int32_t param3) diff --git a/dScripts/RaceSmashServer.cpp b/dScripts/RaceSmashServer.cpp index 582a8ed34..8c8b3f795 100644 --- a/dScripts/RaceSmashServer.cpp +++ b/dScripts/RaceSmashServer.cpp @@ -3,6 +3,7 @@ #include "PossessableComponent.h" #include "RaceSmashServer.h" #include "RacingTaskParam.h" +#include "MissionComponent.h" void RaceSmashServer::OnDie(Entity *self, Entity *killer) { // Crate is smashed by the car diff --git a/dScripts/SGCannon.cpp b/dScripts/SGCannon.cpp index 3912364c9..83f609d08 100644 --- a/dScripts/SGCannon.cpp +++ b/dScripts/SGCannon.cpp @@ -11,6 +11,7 @@ #include "MovementAIComponent.h" #include "ControllablePhysicsComponent.h" #include "../dWorldServer/ObjectIDManager.h" +#include "MissionComponent.h" void SGCannon::OnStartup(Entity *self) { Game::logger->Log("SGCannon", "OnStartup\n"); diff --git a/dScripts/SpawnGryphonServer.cpp b/dScripts/SpawnGryphonServer.cpp index 93cbbac9a..d411569cd 100644 --- a/dScripts/SpawnGryphonServer.cpp +++ b/dScripts/SpawnGryphonServer.cpp @@ -1,6 +1,7 @@ #include "SpawnGryphonServer.h" #include "InventoryComponent.h" #include "GameMessages.h" +#include "MissionComponent.h" void SpawnGryphonServer::SetVariables(Entity *self) { self->SetVar(u"petLOT", 12433); diff --git a/dScripts/SsModularBuildServer.cpp b/dScripts/SsModularBuildServer.cpp index ff05d0e4d..af8286908 100644 --- a/dScripts/SsModularBuildServer.cpp +++ b/dScripts/SsModularBuildServer.cpp @@ -1,6 +1,7 @@ #include "SsModularBuildServer.h" #include "EntityManager.h" #include "Character.h" +#include "MissionComponent.h" void SsModularBuildServer::OnModularBuildExit(Entity* self, Entity* player, bool bCompleted, std::vector modules) { int missionNum = 1732; diff --git a/dScripts/VeBricksampleServer.cpp b/dScripts/VeBricksampleServer.cpp index f42cd9a4a..76486d781 100644 --- a/dScripts/VeBricksampleServer.cpp +++ b/dScripts/VeBricksampleServer.cpp @@ -1,6 +1,7 @@ #include "VeBricksampleServer.h" #include "InventoryComponent.h" #include "EntityManager.h" +#include "MissionComponent.h" #include "GameMessages.h" void VeBricksampleServer::OnUse(Entity *self, Entity *user) { diff --git a/dScripts/ZoneAgProperty.cpp b/dScripts/ZoneAgProperty.cpp index 003860043..a28cded06 100644 --- a/dScripts/ZoneAgProperty.cpp +++ b/dScripts/ZoneAgProperty.cpp @@ -8,6 +8,7 @@ #include "LDFFormat.h" #include "RenderComponent.h" #include "dLogger.h" +#include "MissionComponent.h" void ZoneAgProperty::SetGameVariables(Entity *self) { self->SetVar(GuardGroup, "Guard");