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

[jasper] Fixes for Studio changes, make EditWorldSizeCommand merge
All checks were successful
Build / build (push) Successful in 3m13s
Details

Browse Source
This commit is contained in:
Gary Talent
2024-05-22 02:12:46 -05:00
parent 3c593b8d58
commit f920748e19
6 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.cpp
View File

@@ -31,8 +31,8 @@ int EditObjectName::commandId() const noexcept {
return static_cast<int>(WorldObjCommand::EditObjectName);
}
bool EditObjectName::mergeWith(UndoCommand const*cmd) noexcept {
auto const en = dynamic_cast<EditObjectName const*>(cmd);
bool EditObjectName::mergeWith(UndoCommand const&cmd) noexcept {
auto const en = dynamic_cast<EditObjectName const*>(&cmd);
if (en && m_objIdx == en->m_objIdx) {
m_newVal = en->m_newVal;
return true;

2
src/jasper/modules/world/src/studio/worldobjectseteditor/commands/editobject.hpp
View File

@@ -24,7 +24,7 @@ class EditObjectName: public studio::UndoCommand {
void undo() noexcept override;
[[nodiscard]]
int commandId() const noexcept override;
bool mergeWith(UndoCommand const*cmd) noexcept override;
bool mergeWith(UndoCommand const&cmd) noexcept override;
};
class EditObjectSubSheet: public studio::UndoCommand {