LEGO_Universe/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer synced 2024-08-30 18:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into property-entrance-rewrite

Browse Source
This commit is contained in:
Jett 2023-10-30 02:23:54 +00:00 committed by GitHub
commit a6a6353dfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -148,17 +148,20 @@ foreach (resource_file ${RESOURCE_FILES})
endforeach() endforeach()
message(STATUS "Resource file integrity check complete") message(STATUS "Resource file integrity check complete")
# Copy navmesh data on first build and extract it # if navmeshes directory does not exist, create it
if (NOT EXISTS ${PROJECT_BINARY_DIR}/navmeshes/) if (NOT EXISTS ${PROJECT_BINARY_DIR}/navmeshes)
configure_file( file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/navmeshes)
${CMAKE_SOURCE_DIR}/resources/navmeshes.zip ${PROJECT_BINARY_DIR}/navmeshes.zip
COPYONLY
)
file(ARCHIVE_EXTRACT INPUT ${PROJECT_BINARY_DIR}/navmeshes.zip)
file(REMOVE ${PROJECT_BINARY_DIR}/navmeshes.zip)
endif() endif()
# Copy navmesh data on first build and extract it
configure_file(
${CMAKE_SOURCE_DIR}/resources/navmeshes.zip ${PROJECT_BINARY_DIR}/navmeshes.zip
COPYONLY
)
file(ARCHIVE_EXTRACT INPUT ${PROJECT_BINARY_DIR}/navmeshes.zip DESTINATION ${PROJECT_BINARY_DIR}/navmeshes)
file(REMOVE ${PROJECT_BINARY_DIR}/navmeshes.zip)
# Copy vanity files on first build # Copy vanity files on first build
set(VANITY_FILES "CREDITS.md" "INFO.md" "TESTAMENT.md" "NPC.xml") set(VANITY_FILES "CREDITS.md" "INFO.md" "TESTAMENT.md" "NPC.xml")
foreach(file ${VANITY_FILES}) foreach(file ${VANITY_FILES})

2
dDatabase/Tables/CDLootTableTable.cpp
View File

@ -24,7 +24,7 @@ void SortTable(LootTableEntries& table) {
lootToInsert = oldItrInner; lootToInsert = oldItrInner;
} }
} }
Game::logger->LogDebug("CDLootTableTable", "highest rarity %i item id %i", highestLootRarity, lootToInsert->itemid);
std::swap(*oldItrOuter, *lootToInsert); std::swap(*oldItrOuter, *lootToInsert);
} }
} }

2
dGame/dGameMessages/GameMessages.cpp
View File

@ -1029,7 +1029,7 @@ void GameMessages::SendSetNetworkScriptVar(Entity* entity, const SystemAddress&
} }
void GameMessages::SendDropClientLoot(Entity* entity, const LWOOBJID& sourceID, LOT item, int currency, NiPoint3 spawnPos, int count) { void GameMessages::SendDropClientLoot(Entity* entity, const LWOOBJID& sourceID, LOT item, int currency, NiPoint3 spawnPos, int count) {
if (Game::config->GetValue("disable_drops") == "1") { if (Game::config->GetValue("disable_drops") == "1" || !entity) {
return; return;
} }

2
dNavigation/dNavMesh.cpp
View File

@ -131,7 +131,7 @@ float dNavMesh::GetHeightAtPoint(const NiPoint3& location, const float halfExten
pos[2] = location.z; pos[2] = location.z;
dtPolyRef nearestRef = 0; dtPolyRef nearestRef = 0;
float polyPickExt[3] = { 0.0f, halfExtentsHeight, 0.0f }; float polyPickExt[3] = { 32.0f, halfExtentsHeight, 32.0f };
float nearestPoint[3] = { 0.0f, 0.0f, 0.0f }; float nearestPoint[3] = { 0.0f, 0.0f, 0.0f };
dtQueryFilter filter{}; dtQueryFilter filter{};

BIN
resources/navmeshes.zip
View File

Binary file not shown.