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

[jasper/world/studio] Simplify EditWorldSizeCommand::mergeWith
All checks were successful
Build / build (push) Successful in 3m8s
Details

Browse Source
This commit is contained in:
Gary Talent 2024-05-23 20:54:45 -05:00
parent b51098595a
commit 18e4183623
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jasper/modules/world/src/studio/worldeditor/commands/editsize.cpp
View File

@ -38,9 +38,8 @@ bool EditWorldSizeCommand::mergeWith(studio::UndoCommand const&cmd) noexcept {
m_newSize = es->m_newSize; m_newSize = es->m_newSize;
// undo // undo
resize(m_doc, m_oldSize); resize(m_doc, m_oldSize);
m_doc.tiles = std::move(m_oldMap); m_doc.tiles = m_oldMap;
// redo // redo
m_oldMap = m_doc.tiles;
resize(m_doc, m_newSize); resize(m_doc, m_newSize);
oxLogError(loadWorldStatic(m_objCache, m_doc).moveTo(m_worldStatic)); oxLogError(loadWorldStatic(m_objCache, m_doc).moveTo(m_worldStatic));
return true; return true;