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

fix: add explicit guards before sceneMapI/J computation in GetSceneIDFromPosition

Browse Source 
Agent-Logs-Url: https://github.com/DarkflameUniverse/DarkflameServer/sessions/e331a9a3-fb6b-4574-9456-2a94e4ecdd33

Co-authored-by: aronwk-aaron <26027722+aronwk-aaron@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-03-31 09:21:19 +00:00
committed by GitHub
parent 6ea6ca4ac2
commit 5b9f7e0d8b
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dZoneManager/dZoneManager.cpp
View File

@@ -332,11 +332,19 @@ LWOSCENEID dZoneManager::GetSceneIDFromPosition(const NiPoint3& position) const
heightJ >= 0.0f && heightJ < static_cast<float>(chunk.height)) { heightJ >= 0.0f && heightJ < static_cast<float>(chunk.height)) {
// Map heightmap position to scene map position (same as GenerateTerrainMesh) // Map heightmap position to scene map position (same as GenerateTerrainMesh)
const float sceneMapI = (heightI / static_cast<float>(chunk.width - 1)) * static_cast<float>(chunk.colorMapResolution - 1); const float sceneMapI = (chunk.width > 1)
const float sceneMapJ = (heightJ / static_cast<float>(chunk.height - 1)) * static_cast<float>(chunk.colorMapResolution - 1); ? (heightI / static_cast<float>(chunk.width - 1)) * static_cast<float>(chunk.colorMapResolution - 1)
: 0.0f;
const uint32_t sceneI = std::min(static_cast<uint32_t>(sceneMapI), chunk.colorMapResolution - 1); const float sceneMapJ = (chunk.height > 1)
const uint32_t sceneJ = std::min(static_cast<uint32_t>(sceneMapJ), chunk.colorMapResolution - 1); ? (heightJ / static_cast<float>(chunk.height - 1)) * static_cast<float>(chunk.colorMapResolution - 1)
: 0.0f;
const uint32_t sceneI = (chunk.colorMapResolution > 0)
? std::min(static_cast<uint32_t>(sceneMapI), chunk.colorMapResolution - 1)
: 0;
const uint32_t sceneJ = (chunk.colorMapResolution > 0)
? std::min(static_cast<uint32_t>(sceneMapJ), chunk.colorMapResolution - 1)
: 0;
// Scene map uses the same indexing pattern as heightmap: row * width + col // Scene map uses the same indexing pattern as heightmap: row * width + col
const uint32_t sceneIndex = sceneI * chunk.colorMapResolution + sceneJ; const uint32_t sceneIndex = sceneI * chunk.colorMapResolution + sceneJ;