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

Merge branch 'DarkflameUniverse:main' into PetFixes

Browse Source
This commit is contained in:
jadebenn
2024-01-04 21:11:27 -06:00
committed by GitHub
parent 9a35aad438 72b69c7899
commit c575fd9a6c
140 changed files with 1576 additions and 1190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dZoneManager/CMakeLists.txt
View File

@@ -4,4 +4,6 @@ set(DZONEMANAGER_SOURCES "dZoneManager.cpp"
"Zone.cpp")
add_library(dZoneManager STATIC ${DZONEMANAGER_SOURCES})
target_link_libraries(dZoneManager dPhysics)
target_link_libraries(dZoneManager
PUBLIC dPhysics
INTERFACE dWorldServer)

6
dZoneManager/Spawner.cpp
View File

@@ -51,20 +51,20 @@ Spawner::Spawner(const SpawnerInfo info) {
std::vector<Spawner*> spawnSmashSpawnersN = Game::zoneManager->GetSpawnersByName(m_Info.spawnOnSmashGroupName);
for (Entity* ssEntity : spawnSmashEntities) {
m_SpawnSmashFoundGroup = true;
ssEntity->AddDieCallback([=]() {
ssEntity->AddDieCallback([=, this]() {
Spawn();
});
}
for (Spawner* ssSpawner : spawnSmashSpawners) {
m_SpawnSmashFoundGroup = true;
ssSpawner->AddSpawnedEntityDieCallback([=]() {
ssSpawner->AddSpawnedEntityDieCallback([=, this]() {
Spawn();
});
}
for (Spawner* ssSpawner : spawnSmashSpawnersN) {
m_SpawnSmashFoundGroup = true;
m_SpawnOnSmash = ssSpawner;
ssSpawner->AddSpawnedEntityDieCallback([=]() {
ssSpawner->AddSpawnedEntityDieCallback([=, this]() {
Spawn();
});
}