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

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

Browse Source
This commit is contained in:
Gary Talent 2024-09-30 23:08:08 -05:00
parent d92542dc8b
commit 3cb4058ae1
2 changed files with 4 additions and 4 deletions
Show Stats 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

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

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

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