diff --git a/CHANGELOG.md b/CHANGELOG.md index b7c10e1a74..16312fd98c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Bug #5977: Fatigueless NPCs' corpse underwater changes animation on game load Bug #6939: OpenMW-CS: ID columns are too short Bug #6949: Sun Damage effect doesn't work in quasi exteriors + Bug #6964: Nerasa Dralor Won't Follow Feature #6945: Support S3TC-compressed and BGR/BGRA NiPixelData 0.48.0 diff --git a/apps/openmw/mwlua/luabindings.cpp b/apps/openmw/mwlua/luabindings.cpp index 85e7150a6f..268c8d8165 100644 --- a/apps/openmw/mwlua/luabindings.cpp +++ b/apps/openmw/mwlua/luabindings.cpp @@ -52,7 +52,7 @@ namespace MWLua { auto* lua = context.mLua; sol::table api(lua->sol(), sol::create); - api["API_REVISION"] = 29; + api["API_REVISION"] = 30; api["quit"] = [lua]() { Log(Debug::Warning) << "Quit requested by a Lua script.\n" << lua->debugTraceback(); diff --git a/apps/openmw/mwlua/nearbybindings.cpp b/apps/openmw/mwlua/nearbybindings.cpp index 7a40bdc40c..6bba80fde2 100644 --- a/apps/openmw/mwlua/nearbybindings.cpp +++ b/apps/openmw/mwlua/nearbybindings.cpp @@ -150,7 +150,6 @@ namespace MWLua {"EndPolygonNotFound", DetourNavigator::Status::EndPolygonNotFound}, {"MoveAlongSurfaceFailed", DetourNavigator::Status::MoveAlongSurfaceFailed}, {"FindPathOverPolygonsFailed", DetourNavigator::Status::FindPathOverPolygonsFailed}, - {"GetPolyHeightFailed", DetourNavigator::Status::GetPolyHeightFailed}, {"InitNavMeshQueryFailed", DetourNavigator::Status::InitNavMeshQueryFailed}, })); diff --git a/components/detournavigator/debug.cpp b/components/detournavigator/debug.cpp index 536cad78b2..740be10337 100644 --- a/components/detournavigator/debug.cpp +++ b/components/detournavigator/debug.cpp @@ -38,7 +38,6 @@ namespace DetourNavigator OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(EndPolygonNotFound) OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(MoveAlongSurfaceFailed) OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(FindPathOverPolygonsFailed) - OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(GetPolyHeightFailed) OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE(InitNavMeshQueryFailed) } #undef OPENMW_COMPONENTS_DETOURNAVIGATOR_DEBUG_STATUS_MESSAGE diff --git a/components/detournavigator/findsmoothpath.hpp b/components/detournavigator/findsmoothpath.hpp index 9a6ac0b5cd..0fa756f3b7 100644 --- a/components/detournavigator/findsmoothpath.hpp +++ b/components/detournavigator/findsmoothpath.hpp @@ -239,8 +239,7 @@ namespace DetourNavigator } } - if (dtStatusFailed(navMeshQuery.getPolyHeight(polyRef, polyPos.ptr(), &iterPos.y()))) - return Status::GetPolyHeightFailed; + navMeshQuery.getPolyHeight(polyRef, polyPos.ptr(), &iterPos.y()); iterPos.x() = result->mResultPos.x(); iterPos.z() = result->mResultPos.z(); diff --git a/components/detournavigator/status.hpp b/components/detournavigator/status.hpp index 5f01f04758..aeda99e82a 100644 --- a/components/detournavigator/status.hpp +++ b/components/detournavigator/status.hpp @@ -12,7 +12,6 @@ namespace DetourNavigator EndPolygonNotFound, MoveAlongSurfaceFailed, FindPathOverPolygonsFailed, - GetPolyHeightFailed, InitNavMeshQueryFailed, }; @@ -34,8 +33,6 @@ namespace DetourNavigator return "move along surface on navmesh is failed"; case Status::FindPathOverPolygonsFailed: return "path over navmesh polygons is not found"; - case Status::GetPolyHeightFailed: - return "failed to get polygon height"; case Status::InitNavMeshQueryFailed: return "failed to init navmesh query"; } diff --git a/files/lua_api/openmw/nearby.lua b/files/lua_api/openmw/nearby.lua index 8f19f2b3c2..ac701b6c1f 100644 --- a/files/lua_api/openmw/nearby.lua +++ b/files/lua_api/openmw/nearby.lua @@ -121,8 +121,6 @@ -- algorithm implementation or bad navigation mesh data; -- @field [parent=#FIND_PATH_STATUS] #number FindPathOverPolygonsFailed Path over navigation mesh from `source` to -- `destination` does not exist or navigation mesh is not fully generated to provide the path; --- @field [parent=#FIND_PATH_STATUS] #number GetPolyHeightFailed Found path couldn't be smoothed due to imperfect --- algorithm implementation or bad navigation mesh data; -- @field [parent=#FIND_PATH_STATUS] #number InitNavMeshQueryFailed Couldn't initialize required data due to bad input -- or bad navigation mesh data.