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

undo/redo for deleting strings tied to location/rectangle

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-06-20 12:18:26 -05:00
parent cc5549d76a
commit fa91a6086b
3 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/scenedit/scen.actions.cpp
View File

@@ -572,8 +572,11 @@ static bool handle_rb_action(location the_point, bool option_hit) {
case RB_OUT_SIGN:
size_before = current_terrain->sign_locs.size();
if(option_hit) {
if(j == size_before - 1)
if(j == size_before - 1){
undo_list.add(action_ptr(new aDeleteLocString(current_terrain, current_terrain->sign_locs.back())));
update_edit_menu();
current_terrain->sign_locs.pop_back();
}
else current_terrain->sign_locs[j] = {-1, -1, "*"};
} else {
edit_text_str(j,STRS_OUT_SIGN);
@@ -586,8 +589,11 @@ static bool handle_rb_action(location the_point, bool option_hit) {
case RB_TOWN_SIGN:
size_before = town->sign_locs.size();
if(option_hit) {
if(j == size_before - 1)
if(j == size_before - 1){
undo_list.add(action_ptr(new aDeleteLocString(town, town->sign_locs.back())));
update_edit_menu();
town->sign_locs.pop_back();
}
else town->sign_locs[j] = {-1, -1, "*"};
} else {
edit_text_str(j,STRS_TOWN_SIGN);
@@ -600,8 +606,11 @@ static bool handle_rb_action(location the_point, bool option_hit) {
case RB_OUT_RECT:
size_before = current_terrain->area_desc.size();
if(option_hit) {
if(j == size_before - 1)
if(j == size_before - 1){
undo_list.add(action_ptr(new aDeleteLocString(current_terrain, current_terrain->area_desc.back())));
update_edit_menu();
current_terrain->area_desc.pop_back();
}
else current_terrain->area_desc[j] = {0, 0, 0, 0, "*"};
} else {
edit_text_str(j,STRS_OUT_RECT);
@@ -614,8 +623,11 @@ static bool handle_rb_action(location the_point, bool option_hit) {
case RB_TOWN_RECT:
size_before = town->area_desc.size();
if(option_hit) {
if(j == size_before - 1)
if(j == size_before - 1){
undo_list.add(action_ptr(new aDeleteLocString(town, town->area_desc.back())));
update_edit_menu();
town->area_desc.pop_back();
}
else town->area_desc[j] = {0, 0, 0, 0, "*"};
} else {
edit_text_str(j,STRS_TOWN_RECT);
@@ -3084,7 +3096,6 @@ void start_shops_editing() {
extern size_t num_strs(short mode); // defined in scen.keydlgs.cpp
// mode 0 - scen 1 - out 2 - town 3 - journal
void start_string_editing(eStrMode mode) {
handle_close_terrain_view(MODE_EDIT_STRINGS);
scenario.editor_state.string_editing_mode = mode;

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

@@ -1034,4 +1034,26 @@ bool aEditTalkNode::undo_me() {
bool aEditTalkNode::redo_me() {
scenario.towns[town_num]->talking.talk_nodes[which] = new_node;
return true;
}
bool aDeleteLocString::undo_me() {
if(is_sign){
area->sign_locs.push_back(sign);
start_string_editing(is_town ? STRS_TOWN_SIGN : STRS_OUT_SIGN);
}else{
area->area_desc.push_back(desc);
start_string_editing(is_town ? STRS_TOWN_RECT : STRS_OUT_RECT);
}
return true;
}
bool aDeleteLocString::redo_me() {
if(is_sign){
area->sign_locs.pop_back();
start_string_editing(is_town ? STRS_TOWN_SIGN : STRS_OUT_SIGN);
}else{
area->area_desc.pop_back();
start_string_editing(is_town ? STRS_TOWN_RECT : STRS_OUT_RECT);
}
return true;
}

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

@@ -14,6 +14,7 @@
extern cScenario scenario;
extern cTown* town;
extern bool editing_town;
struct area_ref_t {
bool is_town;
@@ -697,4 +698,20 @@ public:
cAction("Edit Talk Node"), town_num(town_num), which(which), old_node(old_node), new_node(new_node) {}
};
/// Action representing the deletion of a string tied to a location or rectangle in an area
class aDeleteLocString : public cAction {
cArea* area;
bool is_town;
bool is_sign; // either a sign or an area description
sign_loc_t sign;
info_rect_t desc;
bool undo_me() override;
bool redo_me() override;
public:
aDeleteLocString(cArea* area, sign_loc_t sign) :
cAction("Delete Sign Text"), area(area), is_town(editing_town), is_sign(true), sign(sign) {}
aDeleteLocString(cArea* area, info_rect_t desc) :
cAction("Delete Area Description"), area(area), is_town(editing_town), is_sign(false), desc(desc) {}
};
#endif