Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-10-10 17:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update activing and racing components

Browse Source 
Hopefully not going to rename them for a third time, no way
This commit is contained in:
Aaron Kimbre
2023-06-26 15:06:33 -05:00
parent 68f90b7136
commit fd182d222f
22 changed files with 2175 additions and 2176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dScripts/02_server/Map/FV/Racing/RaceMaelstromGeiser.cpp
View File

@@ -3,7 +3,7 @@
#include "PossessableComponent.h"
#include "PossessionComponent.h"
#include "EntityManager.h"
#include "VehicleRacingControlComponent.h"
#include "RacingComponent.h"
#include "dZoneManager.h"
void RaceMaelstromGeiser::OnStartup(Entity* self) {
@@ -59,9 +59,9 @@ void RaceMaelstromGeiser::OnProximityUpdate(Entity* self, Entity* entering, std:
auto* zoneController = dZoneManager::Instance()->GetZoneControlObject();
auto* vehicleRacingControlComponent = zoneController->GetComponent<VehicleRacingControlComponent>();
auto* racingComponent = zoneController->GetComponent<RacingComponent>();
if (vehicleRacingControlComponent) vehicleRacingControlComponent->OnRequestDie(player);
if (racingComponent) racingComponent->OnRequestDie(player);
}
void RaceMaelstromGeiser::OnTimerDone(Entity* self, std::string timerName) {

6
dScripts/ai/ACT/ActVehicleDeathTrigger.cpp
View File

@@ -1,7 +1,7 @@
#include "ActVehicleDeathTrigger.h"
#include "PossessableComponent.h"
#include "GameMessages.h"
#include "VehicleRacingControlComponent.h"
#include "RacingComponent.h"
#include "dZoneManager.h"
#include "EntityManager.h"
#include "PossessionComponent.h"
@@ -44,7 +44,7 @@ void ActVehicleDeathTrigger::OnCollisionPhantom(Entity* self, Entity* target) {
auto* zoneController = dZoneManager::Instance()->GetZoneControlObject();
auto* vehicleRacingControlComponent = zoneController->GetComponent<VehicleRacingControlComponent>();
auto* racingComponent = zoneController->GetComponent<RacingComponent>();
if (vehicleRacingControlComponent) vehicleRacingControlComponent->OnRequestDie(player);
if (racingComponent) racingComponent->OnRequestDie(player);
}