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

[jasper/world/studio] Fixes for Ox update
All checks were successful
Build / build (push) Successful in 3m5s
Details

Browse Source
This commit is contained in:
Gary Talent 2024-04-24 23:21:01 -05:00
parent 35c97cfb67
commit 4955e177c6
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jasper/modules/world/src/studio/worldeditor/commands/addrmobjectset.cpp
View File

@ -30,7 +30,7 @@ void AddObjectSet::redo() noexcept {
void AddObjectSet::undo() noexcept { void AddObjectSet::undo() noexcept {
m_path = std::move(m_doc.objSets[m_insertIdx].path); m_path = std::move(m_doc.objSets[m_insertIdx].path);
--m_doc.objSetIdIdx; --m_doc.objSetIdIdx;
oxIgnoreError(m_doc.objSets.erase(m_insertIdx)); std::ignore = m_doc.objSets.erase(m_insertIdx);
} }
int AddObjectSet::commandId() const noexcept { int AddObjectSet::commandId() const noexcept {
@ -45,7 +45,7 @@ RmObjectSet::RmObjectSet(WorldDoc &doc, size_t idx):
void RmObjectSet::redo() noexcept { void RmObjectSet::redo() noexcept {
m_entry = std::move(m_doc.objSets[m_idx]); m_entry = std::move(m_doc.objSets[m_idx]);
oxIgnoreError(m_doc.objSets.erase(m_idx)); std::ignore = m_doc.objSets.erase(m_idx);
} }
void RmObjectSet::undo() noexcept { void RmObjectSet::undo() noexcept {

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

@ -26,7 +26,7 @@ void AddObject::redo() noexcept {
void AddObject::undo() noexcept { void AddObject::undo() noexcept {
m_obj = std::move(m_doc.objects[m_insertIdx]); m_obj = std::move(m_doc.objects[m_insertIdx]);
oxIgnoreError(m_doc.objects.erase(m_insertIdx)); std::ignore = m_doc.objects.erase(m_insertIdx);
--m_doc.objIdIdx; --m_doc.objIdIdx;
} }

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

@ -27,7 +27,7 @@ void AddPalette::undo() noexcept {
auto const idx = std::find_if(m_doc.palettes.begin(), m_doc.palettes.end(), [this](PaletteCycle const&v) { auto const idx = std::find_if(m_doc.palettes.begin(), m_doc.palettes.end(), [this](PaletteCycle const&v) {
return v.palette == m_palAddr; return v.palette == m_palAddr;
}); });
oxIgnoreError(m_doc.palettes.erase(idx)); std::ignore = m_doc.palettes.erase(idx);
} }
int AddPalette::commandId() const noexcept { int AddPalette::commandId() const noexcept {

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

@ -14,7 +14,7 @@ RmObject::RmObject(WorldObjectSet &doc, size_t const rmIdx) noexcept:
void RmObject::redo() noexcept { void RmObject::redo() noexcept {
m_obj = std::move(m_doc.objects[m_rmIdx]); m_obj = std::move(m_doc.objects[m_rmIdx]);
oxIgnoreError(m_doc.objects.erase(m_rmIdx)); std::ignore = m_doc.objects.erase(m_rmIdx);
} }
void RmObject::undo() noexcept { void RmObject::undo() noexcept {

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

@ -16,7 +16,7 @@ RmPalette::RmPalette(WorldObjectSet &doc, size_t rmIdx) noexcept:
void RmPalette::redo() noexcept { void RmPalette::redo() noexcept {
m_pal = std::move(m_doc.palettes[m_rmIdx]); m_pal = std::move(m_doc.palettes[m_rmIdx]);
oxIgnoreError(m_doc.palettes.erase(m_rmIdx)); std::ignore = m_doc.palettes.erase(m_rmIdx);
} }
void RmPalette::undo() noexcept { void RmPalette::undo() noexcept {