phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-04-14 16:33:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: warmup checks WMO floor proximity, not just terrain existence

Browse source 
Stormwind players stand on WMO floors ~95m above terrain. The previous
check only tested if terrain existed at the spawn XY (it did — far below).
Now checks WMO floor first, then terrain, requiring the ground to be within
15 units of spawn Z. Falls back to tile count after 10s.

Also adds diagnostic logging for useItemBySlot (hearthstone debug).
This commit is contained in:
Kelsi 2026-03-28 11:34:07 -07:00
parent 8aaa2e7ff3
commit 5a8ab87a78
2 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/core/application.cpp
View file

@ -5327,19 +5327,26 @@ void Application::loadOnlineWorldTerrain(uint32_t mapId, float x, float y, float
glm::vec3(x, y, z));
float rx = renderSpawn.x, ry = renderSpawn.y, rz = renderSpawn.z;
// Check terrain
if (auto* tm = renderer->getTerrainManager()) {
if (tm->getHeightAt(rx, ry).has_value()) groundReady = true;
}
// Check WMO floor (cities, buildings)
if (!groundReady) {
if (auto* wmo = renderer->getWMORenderer()) {
if (wmo->getFloorHeight(rx, ry, rz + 5.0f).has_value()) groundReady = true;
// Check WMO floor FIRST (cities like Stormwind stand on WMO floors).
// Terrain exists below WMOs but at the wrong height.
if (auto* wmo = renderer->getWMORenderer()) {
auto wmoH = wmo->getFloorHeight(rx, ry, rz + 5.0f);
if (wmoH.has_value() && std::abs(*wmoH - rz) < 15.0f) {
groundReady = true;
}
}
// After minimum warmup, also accept if enough terrain tiles are loaded
// (player may be on M2 collision or other surface)
if (!groundReady && elapsed >= 8.0f) {
// Check terrain — but only if it's close to spawn Z (within 15 units).
// Terrain far below a WMO city doesn't count as ground.
if (!groundReady) {
if (auto* tm = renderer->getTerrainManager()) {
auto tH = tm->getHeightAt(rx, ry);
if (tH.has_value() && std::abs(*tH - rz) < 15.0f) {
groundReady = true;
}
}
}
// After 10s, accept any loaded terrain (fallback for unusual spawns)
if (!groundReady && elapsed >= 10.0f) {
if (auto* tm = renderer->getTerrainManager()) {
groundReady = (tm->getLoadedTileCount() >= 4);
}