Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-15 04:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

lol lmao

Browse Source
This commit is contained in:
David Markowitz 2023-08-07 20:45:26 -07:00
parent 4fbd536e74
commit 1d4d1414e9
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dGame/Entity.cpp
View File

@ -708,7 +708,6 @@ void Entity::Initialize() {
MovingPlatformComponent* plat = new MovingPlatformComponent(this, pathName); MovingPlatformComponent* plat = new MovingPlatformComponent(this, pathName);
m_Components.insert(std::make_pair(eReplicaComponentType::MOVING_PLATFORM, plat)); m_Components.insert(std::make_pair(eReplicaComponentType::MOVING_PLATFORM, plat));
} else if (path->pathType == PathType::Movement) { } else if (path->pathType == PathType::Movement) {
Game::logger->Log("Entity", "is movement %i", GetLOT());
auto movementAIcomp = GetComponent<MovementAIComponent>(); auto movementAIcomp = GetComponent<MovementAIComponent>();
if (!movementAIcomp) { if (!movementAIcomp) {
movementAIcomp = new MovementAIComponent(this, {}); movementAIcomp = new MovementAIComponent(this, {});

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

@ -310,11 +310,9 @@ void SGCannon::OnActivityTimerDone(Entity* self, const std::string& name) {
}); });
// Save the enemy and tell it to start pathing // Save the enemy and tell it to start pathing
if (enemy != nullptr) {
const_cast<std::vector<LWOOBJID>&>(self->GetVar<std::vector<LWOOBJID>>(SpawnedObjects)).push_back(enemy->GetObjectID()); const_cast<std::vector<LWOOBJID>&>(self->GetVar<std::vector<LWOOBJID>>(SpawnedObjects)).push_back(enemy->GetObjectID());
GameMessages::SendPlatformResync(enemy, UNASSIGNED_SYSTEM_ADDRESS); GameMessages::SendPlatformResync(enemy, UNASSIGNED_SYSTEM_ADDRESS);
} }
}
} else if (name == EndGameBufferTimer) { } else if (name == EndGameBufferTimer) {
RecordPlayerScore(self); RecordPlayerScore(self);
StopGame(self, false); StopGame(self, false);