mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-01 16:37:45 +00:00
Code Activity

Merge pull request #486 from NotAdam/develop

Browse source 
fix dead bnpcs not dying, add recast
This commit is contained in:
Mordred 2019-01-20 10:54:47 +01:00 • committed by GitHub
commit 1d1348e62c
5 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -4,3 +4,6 @@
[submodule "deps/spdlog"] [submodule "deps/spdlog"]
path = deps/spdlog path = deps/spdlog
url = https://github.com/gabime/spdlog.git url = https://github.com/gabime/spdlog.git
[submodule "deps/recastnavigation"]
path = deps/recastnavigation
url = https://github.com/SapphireServer/recastnavigation

1
CMakeLists.txt
View file

@ -44,6 +44,7 @@ add_subdirectory( "deps/zlib" )
add_subdirectory( "deps/MySQL" ) add_subdirectory( "deps/MySQL" )
add_subdirectory( "deps/datReader" ) add_subdirectory( "deps/datReader" )
add_subdirectory( "deps/mysqlConnector" ) add_subdirectory( "deps/mysqlConnector" )
add_subdirectory( "deps/recastnavigation" )
############################## ##############################
# Main Sapphire Components # # Main Sapphire Components #

1
deps/recastnavigation vendored Submodule

@ -0,0 +1 @@
Subproject commit d24db2de131d6be5a1bc38067fa8b649544a0dd2

7
src/tools/pcb_reader/CMakeLists.txt
View file

@ -8,9 +8,12 @@ file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
add_executable(pcb_reader2 ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES}) add_executable(pcb_reader2 ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
if (UNIX) if (UNIX)
target_link_libraries (pcb_reader2 common xivdat pthread mysqlclient dl z stdc++fs ) target_link_libraries( pcb_reader2 common xivdat pthread mysqlclient dl z stdc++fs Recast Detour )
else() else()
target_link_libraries (pcb_reader2 common xivdat mysql zlib) target_link_libraries( pcb_reader2 common xivdat mysql zlib Recast Detour )
endif() endif()
target_include_directories( pcb_reader2
PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/../../deps/" )

3
src/world/Actor/BNpc.cpp
View file

@ -301,6 +301,9 @@ void Sapphire::Entity::BNpc::update( int64_t currTime )
const uint8_t aggroRange = 8; const uint8_t aggroRange = 8;
const uint8_t maxDistanceToOrigin = 30; const uint8_t maxDistanceToOrigin = 30;
if( m_status == ActorStatus::Dead )
return;
switch( m_state ) switch( m_state )
{ {
case BNpcState::Retreat: case BNpcState::Retreat: