drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

[jasper] Change macro names to comply with broader conventions

Browse Source
This commit is contained in:
Gary Talent
2024-12-21 02:41:27 -06:00
parent 8c4f55621d
commit 33425ccf3a
14 changed files with 105 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/jasper/modules/world/src/studio/worldobjectseteditor/collisionmapview.cpp
View File

@@ -30,9 +30,9 @@ ox::Error CollisionView::setup(
m_subsheetTilesHeight = h;
m_sheetTileStart = tile;
ncore::setBgStatus(*m_nctx, 0, true);
oxReturnError(ncore::loadBgTileSheet(*m_nctx, 0, tsAddr));
oxReturnError(ncore::loadBgPalette(*m_nctx, 0, palAddr));
oxReturnError(m_highlighter.setup({w / 2, h / 2}));
OX_RETURN_ERROR(ncore::loadBgTileSheet(*m_nctx, 0, tsAddr));
OX_RETURN_ERROR(ncore::loadBgPalette(*m_nctx, 0, palAddr));
OX_RETURN_ERROR(m_highlighter.setup({w / 2, h / 2}));
buildGlBuffers(colMap);
return {};
}

2
src/jasper/modules/world/src/studio/worldobjectseteditor/commands/addobject.cpp
View File

@@ -27,7 +27,7 @@ ox::Error AddObject::redo() noexcept {
ox::Error AddObject::undo() noexcept {
m_obj = std::move(m_doc.objects[m_insertIdx]);
oxReturnError(m_doc.objects.erase(m_insertIdx));
OX_RETURN_ERROR(m_doc.objects.erase(m_insertIdx));
--m_doc.objIdIdx;
return {};
}