Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-10-02 10:53:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(zone): don't spawn carver_only objects, keep them as walls

Browse Source 
The client never loads a level object whose config has carver_only set (its
resource manager skips the load; LWOBasePhysComponent::LoadConfigData
0x00c495c9 reads the flag next to navmesh_carver), and live never sent one:
none of the 331 carver_only placements (mostly Crux Prime's trigger boxes)
shows up among the live constructions, where their zones' other objects do.
DLU spawned them as objects.

They are skipped now. The ones that carve the navmesh (53, in six zones,
among them the Avant Gardens Sentinel camp walls) still stop the server's movers: their shape
goes into the world's movement blockers without an object, owned by the
physics world (dpWorld::AddOwnedMovementBlocker) and freed when it shuts
down. None of them has a script, trigger or group.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-30 07:49:04 -05:00
parent 175d2930b7
commit da9ae3b3c4
5 changed files with 88 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
dGame/dComponents/PhysicsComponent.cpp
View File

@@ -97,6 +97,56 @@ void PhysicsComponent::RegisterMovementBlocker(const eReplicaComponentType type,
dpWorld::AddMovementBlocker(m_MovementBlocker, *filter);
}
namespace {
bool SettingIsTrue(const LwoNameValue& settings, const std::u16string& key) {
const auto it = settings.find(key);
return it != settings.end() && it->second && GeneralUtils::TryParse<int32_t>(it->second->GetValueAsString()).value_or(0) != 0;
}
}
bool PhysicsComponent::IsCarverOnly(const LwoNameValue& settings) {
return SettingIsTrue(settings, u"carver_only");
}
bool PhysicsComponent::AddLevelMovementBlocker(const LWOOBJID id, const LOT lot, const LwoNameValue& settings, const NiPoint3& position, const NiQuaternion& rotation, const float scale) {
auto* const registry = CDClientManager::GetTable<CDComponentsRegistryTable>();
auto* const physicsTable = CDClientManager::GetTable<CDPhysicsComponentTable>();
// The physics component it would have: fixed simple physics is solid (no level object of this kind moves), a
// phantom volume is not
for (const auto type : { eReplicaComponentType::SIMPLE_PHYSICS, eReplicaComponentType::PHANTOM_PHYSICS }) {
const auto componentID = registry->GetByIDAndType(lot, type, -1);
if (componentID == -1) continue;
int32_t collisionGroup = 0;
if (const auto* const info = physicsTable->GetByID(componentID)) collisionGroup = info->collisionGroup;
if (const auto it = settings.find(u"CollisionGroupID"); it != settings.end() && it->second) {
collisionGroup = GeneralUtils::TryParse<int32_t>(it->second->GetValueAsString()).value_or(collisionGroup);
}
const bool solid = type == eReplicaComponentType::SIMPLE_PHYSICS;
const auto filter = dpMovementBlockers::BlockingFilter(SettingIsTrue(settings, u"navmesh_carver"), solid, static_cast<uint32_t>(collisionGroup));
if (!filter) return false;
auto shapePosition = position;
bool isFallback = false;
auto* const blocker = CreateAssetShape(id, lot, type, collisionGroup, scale, rotation, shapePosition, &isFallback);
if (!blocker) return false;
if (isFallback) {
LOG_DEBUG("%llu (LOT %i) should block movement, but the server doesn't know its shape", id, lot);
delete blocker;
return false;
}
blocker->SetScale(scale);
blocker->SetRotation(rotation);
blocker->SetPosition(shapePosition);
dpWorld::AddOwnedMovementBlocker(blocker, *filter);
return true;
}
return false;
}
bool PhysicsComponent::OnGetPosition(GameMessages::GetPosition& msg) {
msg.pos = GetPosition();
return true;