mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-28 22:13:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix argument types mismatch

Browse Source
This commit is contained in:
Andrei Kortunov 2021-10-24 18:45:46 +04:00
parent 107a9ecb17
commit 0f3c0cb0a0
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/detournavigator/preparednavmeshdatatuple.hpp
View File

@ -14,11 +14,11 @@ namespace DetourNavigator
constexpr auto makeTuple(const rcPolyMesh& v) noexcept
{
return std::tuple(
Span(v.verts, getVertsLength(v)),
Span(v.polys, getPolysLength(v)),
Span(v.regs, getRegsLength(v)),
Span(v.flags, getFlagsLength(v)),
Span(v.areas, getAreasLength(v)),
Span(v.verts, static_cast<int>(getVertsLength(v))),
Span(v.polys, static_cast<int>(getPolysLength(v))),
Span(v.regs, static_cast<int>(getRegsLength(v))),
Span(v.flags, static_cast<int>(getFlagsLength(v))),
Span(v.areas, static_cast<int>(getAreasLength(v))),
ArrayRef(v.bmin),
ArrayRef(v.bmax),
v.cs,
@ -31,9 +31,9 @@ namespace DetourNavigator
constexpr auto makeTuple(const rcPolyMeshDetail& v) noexcept
{
return std::tuple(
Span(v.meshes, getMeshesLength(v)),
Span(v.verts, getVertsLength(v)),
Span(v.tris, getTrisLength(v))
Span(v.meshes, static_cast<int>(getMeshesLength(v))),
Span(v.verts, static_cast<int>(getVertsLength(v))),
Span(v.tris, static_cast<int>(getTrisLength(v)))
);
}

2
components/esm/luascripts.cpp
View File

@ -32,7 +32,7 @@ std::string ESM::loadLuaBinaryData(ESMReader& esm)
{
esm.getSubHeader();
data.resize(esm.getSubSize());
esm.getExact(data.data(), data.size());
esm.getExact(data.data(), static_cast<int>(data.size()));
}
return data;
}