diff --git a/src/jasper/modules/world/include/jasper/world/worlddoc.hpp b/src/jasper/modules/world/include/jasper/world/worlddoc.hpp index 5db52df..4d6f0c6 100644 --- a/src/jasper/modules/world/include/jasper/world/worlddoc.hpp +++ b/src/jasper/modules/world/include/jasper/world/worlddoc.hpp @@ -92,7 +92,7 @@ constexpr ox::Result objectSetPath(WorldDoc const&wd, uint64_t setId auto const obj = ox::find_if(wd.objSets.begin(), wd.objSets.end(), [setId](ObjectSetEntry const&e) { return e.id == setId; }); - oxReturnError(OxError(obj == wd.objSets.end(), "Obj set not found")); + oxReturnError(ox::Error(obj == wd.objSets.end(), "Obj set not found")); return obj->path; } @@ -101,7 +101,7 @@ constexpr ox::Result objectSetId(WorldDoc const&wd, ox::StringView set auto const obj = ox::find_if(wd.objSets.begin(), wd.objSets.end(), [setPath](ObjectSetEntry const&e) { return e.path == setPath; }); - oxReturnError(OxError(obj == wd.objSets.end(), "Obj set not found")); + oxReturnError(ox::Error(obj == wd.objSets.end(), "Obj set not found")); return obj->id; } diff --git a/src/jasper/modules/world/src/studio/maptilehighlighter.cpp b/src/jasper/modules/world/src/studio/maptilehighlighter.cpp index aff30bb..7189cd0 100644 --- a/src/jasper/modules/world/src/studio/maptilehighlighter.cpp +++ b/src/jasper/modules/world/src/studio/maptilehighlighter.cpp @@ -70,7 +70,7 @@ void MapTileHighlighter::draw() noexcept { ox::Error MapTileHighlighter::setTileHighlight(ox::Point const&addr, bool const hl) noexcept { if (addr.x >= m_subsheetTilesWidth || addr.y >= m_subsheetTilesHeight) { - return OxError(1, "tile addr out of bounds"); + return ox::Error(1, "tile addr out of bounds"); } auto const vboLength = static_cast(s_programSrc.rowLen) * 4; auto constexpr eboLength = 6; diff --git a/src/jasper/modules/world/src/world.cpp b/src/jasper/modules/world/src/world.cpp index 3b19f09..0ddc9d4 100644 --- a/src/jasper/modules/world/src/world.cpp +++ b/src/jasper/modules/world/src/world.cpp @@ -16,7 +16,7 @@ World::World(ncore::Context &nctx, WorldStatic const&worldStatic) noexcept: ox::Error World::setupDisplay() noexcept { if (m_worldStatic.palettes.empty()) { - return OxError(1, "World has no palettes"); + return ox::Error(1, "World has no palettes"); } for (auto i = 0u; auto const&palAddr : m_worldStatic.palettes) { oxRequire(pal, readObj(keelCtx(m_nctx), palAddr));