openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

undo/redo for editing item shortcuts

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-06-19 17:07:53 -05:00
parent 1db78b4a1b
commit 8d26268e7d
5 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/scenedit/scen.core.cpp
View File

@@ -2997,7 +2997,12 @@ static bool save_item_placement(cDialog& me, cScenario::cItemStorage& storage, s
if(cre(storage.item_odds[i],
0,100,"All item chances must bve from 0 to 100.","",&me)) return false;
}
scenario.storage_shortcuts[which] = storage;
if(storage != scenario.storage_shortcuts[which]){
// the edit menu will update when the dialog closes
undo_list.add(action_ptr(new aEditItemShortcut(which, scenario.storage_shortcuts[which], storage)));
scenario.storage_shortcuts[which] = storage;
}
return true;
}
@@ -3086,6 +3091,7 @@ void edit_item_placement() {
put_item_placement_in_dlog(shortcut_dlg, storage, cur_shortcut);
shortcut_dlg.run();
update_edit_menu();
}
static bool save_scen_details(cDialog& me, std::string, eKeyMod) {

8
src/scenedit/scen.undo.cpp
View File

@@ -920,12 +920,12 @@ bool aEditScenTimers::redo_me() {
return true;
}
bool aEditItemShortcuts::undo_me() {
scenario.storage_shortcuts = old_shortcuts;
bool aEditItemShortcut::undo_me() {
scenario.storage_shortcuts[which] = old_shortcut;
return true;
}
bool aEditItemShortcuts::redo_me() {
scenario.storage_shortcuts = new_shortcuts;
bool aEditItemShortcut::redo_me() {
scenario.storage_shortcuts[which] = new_shortcut;
return true;
}

11
src/scenedit/scen.undo.hpp
View File

@@ -572,14 +572,15 @@ public:
cAction("Edit Scenario Event Timers"), old_timers(old_timers), new_timers(new_timers) {}
};
class aEditItemShortcuts : public cAction {
std::array<cScenario::cItemStorage,10> old_shortcuts;
std::array<cScenario::cItemStorage,10> new_shortcuts;
class aEditItemShortcut : public cAction {
size_t which;
cScenario::cItemStorage old_shortcut;
cScenario::cItemStorage new_shortcut;
bool undo_me() override;
bool redo_me() override;
public:
aEditItemShortcuts(std::array<cScenario::cItemStorage,10> old_shortcuts, std::array<cScenario::cItemStorage,10> new_shortcuts) :
cAction("Edit Item Placement Shortcuts"), old_shortcuts(old_shortcuts), new_shortcuts(new_shortcuts) {}
aEditItemShortcut(size_t which, cScenario::cItemStorage old_shortcut, cScenario::cItemStorage new_shortcut) :
cAction("Edit Item Placement Shortcut"), which(which), old_shortcut(old_shortcut), new_shortcut(new_shortcut) {}
};
#endif