From 41898bef86288c68c17cff9b1dcd53f8cf4721b7 Mon Sep 17 00:00:00 2001 From: Aaron Kimbrell Date: Fri, 23 Jun 2023 08:50:15 -0500 Subject: [PATCH] foot race player flag fix (#1125) and include fixes --- dNavigation/dTerrain/RawFile.h | 1 + dScripts/ai/ACT/FootRace/BaseFootRaceManager.cpp | 5 ++--- dZoneManager/LUTriggers.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dNavigation/dTerrain/RawFile.h b/dNavigation/dTerrain/RawFile.h index 84afae94..2a702c53 100644 --- a/dNavigation/dTerrain/RawFile.h +++ b/dNavigation/dTerrain/RawFile.h @@ -2,6 +2,7 @@ #include #include +#include class RawChunk; struct RawMesh; diff --git a/dScripts/ai/ACT/FootRace/BaseFootRaceManager.cpp b/dScripts/ai/ACT/FootRace/BaseFootRaceManager.cpp index 4d1ae5f5..769a8fd9 100644 --- a/dScripts/ai/ACT/FootRace/BaseFootRaceManager.cpp +++ b/dScripts/ai/ACT/FootRace/BaseFootRaceManager.cpp @@ -6,8 +6,7 @@ void BaseFootRaceManager::OnStartup(Entity* self) { // TODO: Add to FootRaceStarter group } -void BaseFootRaceManager::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, - int32_t param2, int32_t param3) { +void BaseFootRaceManager::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2, int32_t param3) { const auto splitArguments = GeneralUtils::SplitString(args, '_'); if (splitArguments.size() > 1) { @@ -37,7 +36,7 @@ void BaseFootRaceManager::OnFireEventServerSide(Entity* self, Entity* sender, st if (character != nullptr) { character->SetPlayerFlag(115, false); if (param2 != -1) // Certain footraces set a flag - character->SetPlayerFlag(static_cast(param2), true); + character->SetPlayerFlag(param2, true); } StopActivity(self, player->GetObjectID(), 0, param1); diff --git a/dZoneManager/LUTriggers.h b/dZoneManager/LUTriggers.h index a93cd67d..75662778 100644 --- a/dZoneManager/LUTriggers.h +++ b/dZoneManager/LUTriggers.h @@ -3,6 +3,7 @@ #include #include +#include class Command; class Event;