Map edit hotkeys to rotate ab object and cycle through its frames (exult#636)

* Fix exult#622

Author: DominusExult

cheat.cc

@@ -742,6 +742,46 @@ void Cheat::move_selected(int dx, int dy, int dz) {
 	}
 }
 
+/*
+ *  Cycle the frame of the selected objects.
+ */
+void Cheat::cycle_selected_frame(int direction) {
+	if (selected.empty()) {
+		return;
+	}
+	for (auto& it : selected) {
+		Game_object* obj          = it.get();
+		int          maxFrames    = obj->get_num_frames();
+		int          currentFrame = obj->get_framenum();
+		int          newFrame     = currentFrame + direction;
+
+		if (newFrame >= maxFrames) {
+			newFrame = 0;
+		} else if (newFrame < 0) {
+			newFrame = maxFrames - 1;
+		}
+
+		obj->change_frame(newFrame);
+		gwin->add_dirty(obj);
+	}
+	gwin->set_all_dirty();
+}
+
+/*
+ *  Rotate the frame of the selected objects.
+ */
+void Cheat::rotate_selected_frame() {
+	if (selected.empty()) {
+		return;
+	}
+	for (auto& it : selected) {
+		Game_object* obj = it.get();
+		obj->change_frame(obj->get_rotated_frame(1));
+		gwin->add_dirty(obj);
+	}
+	gwin->set_all_dirty();
+}
+
 bool Cheat::is_selected(Game_object* o) {
 	for (auto& it : selected) {
 		if (o == it.get()) {

cheat.h

@@ -205,6 +205,8 @@ class Cheat : public Game_singletons {
 	void delete_selected();
 	void move_selected_objs(int dx, int dy, int dz);
 	void move_selected(int dx, int dy, int dz);
+	void cycle_selected_frame(int direction);
+	void rotate_selected_frame();
 
 	const std::vector<Game_object_shared>& get_selected() const {
 		return selected;

data/bg/defaultkeys.txt

@@ -50,6 +50,9 @@ Ctrl-pagedown	move_selected	 0  0 -1
 Ctrl-C		copy
 Ctrl-x		cut
 Ctrl-v		paste
+Ctrl-KP+	cycle_frames_next	 1
+Ctrl-KP-	cycle_frames_prev	-1
+CTRL-KP*	rotate_frames
 
 F2		cheat_screen
 F3		map_teleport

data/si/defaultkeys.txt

@@ -50,6 +50,9 @@ Ctrl-pagedown	move_selected	 0  0 -1
 Ctrl-C		copy
 Ctrl-x		cut
 Ctrl-v		paste
+Ctrl-KP+	cycle_frames_next	 1
+Ctrl-KP-	cycle_frames_prev	-1
+CTRL-KP*	rotate_frames
 
 F2		cheat_screen
 F3		map_teleport

keyactions.cc

@@ -692,6 +692,15 @@ void ActionMoveSelected(const int* params) {
 	cheat.move_selected(params[0], params[1], params[2]);
 }
 
+void ActionCycleFrames(const int* params) {
+	cheat.cycle_selected_frame(params[0]);
+}
+
+void ActionRotateFrames(const int* params) {
+	ignore_unused_variable_warning(params);
+	cheat.rotate_selected_frame();
+}
+
 //  { ActionToggleEggs, 0, "Toggle egg display", cheat_keys, NONE },
 void ActionToggleEggs(const int* params) {
 	ignore_unused_variable_warning(params);

keyactions.h

@@ -75,6 +75,8 @@ void ActionCreateShape(const int* params);
 void ActionDeleteObject(const int* params);
 void ActionDeleteSelected(const int* params);
 void ActionMoveSelected(const int* params);
+void ActionCycleFrames(const int* params);
+void ActionRotateFrames(const int* params);
 void ActionToggleEggs(const int* params);
 void ActionGodMode(const int* params);
 void ActionGender(const int* params);

keys.cc

@@ -263,6 +263,12 @@ const struct Action {
 		 Action::mapedit_keys,         NONE,  true,   true,  true,  false},
 		{       "MOVE_SELECTED",       ActionMoveSelected,           nullptr,             "Move selected",
 		 Action::mapedit_keys,         NONE,  true,   true,  true,  false},
+		{   "CYCLE_FRAMES_NEXT",       ActionCycleFrames,            nullptr,         "Cycle frames next",
+		 Action::mapedit_keys,         NONE,  true,   true,  true,  false},
+		{   "CYCLE_FRAMES_PREV",       ActionCycleFrames,            nullptr,      "Cycle frames previus",
+		 Action::mapedit_keys,         NONE,  true,   true,  true,  false},
+		{       "ROTATE_FRAMES",       ActionRotateFrames,            nullptr,            "Rotate frames",
+		 Action::mapedit_keys,         NONE,  true,   true,  true,  false},
 		{       "WRITE_MINIMAP",       ActionWriteMiniMap,           nullptr,             "Write minimap",
 		 Action::mapedit_keys,         NONE, false,   true,  true,  false},
 		{			 "REPAINT",            ActionRepaint,           nullptr,            "Repaint screen",    Action::dont_show,