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

Merge branch 'main' into moreMovementAi

Browse Source
This commit is contained in:
David Markowitz
2024-02-24 22:19:45 -08:00
parent 458db4682b 721ea78bb4
commit 6863ee9d76
799 changed files with 18359 additions and 15526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dScripts/zone/CMakeLists.txt
View File

@@ -18,4 +18,12 @@ foreach(file ${DSCRIPTS_SOURCES_ZONE_PROPERTY})
set(DSCRIPTS_SOURCES_ZONE ${DSCRIPTS_SOURCES_ZONE} "PROPERTY/${file}")
endforeach()
set(DSCRIPTS_SOURCES_ZONE ${DSCRIPTS_SOURCES_ZONE} PARENT_SCOPE)
add_library(dScriptsZone STATIC ${DSCRIPTS_SOURCES_ZONE})
target_include_directories(dScriptsZone PUBLIC "."
"AG"
"LUPs"
"PROPERTY"
"PROPERTY/FV"
"PROPERTY/GF"
"PROPERTY/NS")
target_precompile_headers(dScriptsZone REUSE_FROM dScriptsBase)

7
dScripts/zone/LUPs/WblGenericZone.cpp
View File

@@ -1,10 +1,11 @@
#include "WblGenericZone.h"
#include "Player.h"
#include "CharacterComponent.h"
void WblGenericZone::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2, int32_t param3) {
if (args == m_WblAbortMsg) {
if (!sender) return;
auto player = dynamic_cast<Player*>(sender);
if (player) player->SendToZone(m_WblMainZone);
auto* characterComponent = sender->GetComponent<CharacterComponent>();
if (characterComponent) characterComponent->SendToZone(m_WblMainZone);
}
}