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

rename possessor to possession

Browse Source
This commit is contained in:
Aaron Kimbre
2023-06-26 12:36:36 -05:00
parent d29287f9d9
commit 68f90b7136
18 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
#include "RaceMaelstromGeiser.h"
#include "GameMessages.h"
#include "PossessableComponent.h"
#include "PossessorComponent.h"
#include "PossessionComponent.h"
#include "EntityManager.h"
#include "VehicleRacingControlComponent.h"
#include "dZoneManager.h"
@@ -37,13 +37,13 @@ void RaceMaelstromGeiser::OnProximityUpdate(Entity* self, Entity* entering, std:
vehicle = entering;
} else if (entering->IsPlayer()) {
auto* possessorComponent = entering->GetComponent<PossessorComponent>();
auto* possessionComponent = entering->GetComponent<PossessionComponent>();
if (possessorComponent == nullptr) {
if (possessionComponent == nullptr) {
return;
}
vehicle = EntityManager::Instance()->GetEntity(possessorComponent->GetPossessable());
vehicle = EntityManager::Instance()->GetEntity(possessionComponent->GetPossessable());
if (vehicle == nullptr) {
return;

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

@@ -4,7 +4,7 @@
#include "VehicleRacingControlComponent.h"
#include "dZoneManager.h"
#include "EntityManager.h"
#include "PossessorComponent.h"
#include "PossessionComponent.h"
void ActVehicleDeathTrigger::OnCollisionPhantom(Entity* self, Entity* target) {
@@ -22,13 +22,13 @@ void ActVehicleDeathTrigger::OnCollisionPhantom(Entity* self, Entity* target) {
return;
} else if (target->IsPlayer()) {
auto* possessorComponent = target->GetComponent<PossessorComponent>();
auto* possessionComponent = target->GetComponent<PossessionComponent>();
if (possessorComponent == nullptr) {
if (possessionComponent == nullptr) {
return;
}
vehicle = EntityManager::Instance()->GetEntity(possessorComponent->GetPossessable());
vehicle = EntityManager::Instance()->GetEntity(possessionComponent->GetPossessable());
if (vehicle == nullptr) {
return;

6
dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp
View File

@@ -5,7 +5,7 @@
#include "Player.h"
#include "Character.h"
#include "ShootingGalleryComponent.h"
#include "PossessorComponent.h"
#include "PossessionComponent.h"
#include "CharacterComponent.h"
#include "SimplePhysicsComponent.h"
#include "MovementAIComponent.h"
@@ -105,7 +105,7 @@ void SGCannon::OnActivityStateChangeRequest(Entity* self, LWOOBJID senderID, int
if (characterComponent != nullptr) {
characterComponent->SetIsRacing(true);
characterComponent->SetCurrentActivity(eGameActivity::SHOOTING_GALLERY);
auto* possessor = player->GetComponent<PossessorComponent>();
auto* possessor = player->GetComponent<PossessionComponent>();
if (possessor) {
possessor->SetPossessable(self->GetObjectID());
possessor->SetPossessableType(ePossessionType::NO_POSSESSION);
@@ -288,7 +288,7 @@ void SGCannon::OnActivityTimerDone(Entity* self, const std::string& name) {
EntityManager::Instance()->ConstructEntity(enemy);
auto* movementAiComponent = enemy->AddComponent<MovementAIComponent>(0U);
movementAiComponent->SetSpeed(toSpawn.initialSpeed);
movementAiComponent->SetCurrentSpeed(toSpawn.initialSpeed);
movementAiComponent->SetHaltDistance(0.0f);

8
dScripts/ai/RACING/OBJECTS/RaceImaginePowerup.cpp
View File

@@ -1,6 +1,6 @@
#include "DestroyableComponent.h"
#include "EntityManager.h"
#include "PossessorComponent.h"
#include "PossessionComponent.h"
#include "RaceImaginePowerup.h"
#include "eRacingTaskParam.h"
#include "MissionComponent.h"
@@ -9,13 +9,13 @@
void RaceImaginePowerup::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1,
int32_t param2, int32_t param3) {
if (sender->IsPlayer() && args == "powerup") {
auto* possessorComponent = sender->GetComponent<PossessorComponent>();
auto* possessionComponent = sender->GetComponent<PossessionComponent>();
if (possessorComponent == nullptr) {
if (possessionComponent == nullptr) {
return;
}
auto* vehicle = EntityManager::Instance()->GetEntity(possessorComponent->GetPossessable());
auto* vehicle = EntityManager::Instance()->GetEntity(possessionComponent->GetPossessable());
if (vehicle == nullptr) {
return;