New controll hotkey actions for the base game handling.

wesnoth · Nov 27, 2013 · 7e46df9 · 7e46df9
1 parent f85d83a
commit 7e46df9
Show file tree

Hide file tree

Showing 6 changed files with 295 additions and 47 deletions.
diff --git a/src/hotkeys.cpp b/src/hotkeys.cpp
@@ -67,8 +67,10 @@ namespace hotkey {
 hotkey_command_temp hotkey_list_[] = {
 
 	{ hotkey::HOTKEY_CANCEL, N_("cancel"), N_("Cancel"), false, hotkey::SCOPE_GENERAL, "" },
-	{ hotkey::HOTKEY_LEFT_MOUSE_CLICK, "leftmouseclick", N_("Left Mouse Click"), false, hotkey::SCOPE_GENERAL, "" },
-	{ hotkey::HOTKEY_RIGHT_MOUSE_CLICK, "rightmouseclick", N_("Right Mouse Click"), false, hotkey::SCOPE_GENERAL, "" },
+	{ hotkey::HOTKEY_SELECT_HEX, "selecthex", N_("Select Hex"), false, hotkey::SCOPE_GAME, "" },
+	{ hotkey::HOTKEY_DESELECT_HEX, "deselecthex", N_("Deselect Hex"), false, hotkey::SCOPE_GAME, "" },
+	{ hotkey::HOTKEY_MOVE_ACTION, "moveaction", N_("Move/Attack"), false, hotkey::SCOPE_GAME, "" },
+	{ hotkey::HOTKEY_SELECT_AND_ACTION, "selectmoveaction", N_("Select/Move/Attack"), false, hotkey::SCOPE_GAME, "" },
 	{ hotkey::HOTKEY_ANIMATE_MAP, "animatemap", N_("Animate Map"), false, hotkey::SCOPE_GENERAL, "" },
 	{ hotkey::HOTKEY_CYCLE_UNITS, "cycle", N_("Next Unit"), false, hotkey::SCOPE_GAME, "" },
 	{ hotkey::HOTKEY_CYCLE_BACK_UNITS, "cycleback", N_("Previous Unit"), false, hotkey::SCOPE_GAME, "" },
@@ -1314,11 +1316,17 @@ bool command_executor::execute_command(const hotkey_command&  cmd, int /*index*/
 		case HOTKEY_WB_SUPPOSE_DEAD:
 			whiteboard_suppose_dead();
 			break;
-		case HOTKEY_LEFT_MOUSE_CLICK:
-			left_mouse_click();
+		case HOTKEY_SELECT_HEX:
+			select_hex();
 			break;
-		case HOTKEY_RIGHT_MOUSE_CLICK:
-			right_mouse_click();
+		case HOTKEY_DESELECT_HEX:
+			deselect_hex();
+			break;
+		case HOTKEY_MOVE_ACTION:
+			move_action();
+			break;
+		case HOTKEY_SELECT_AND_ACTION:
+			select_and_action();
 			break;
 		case HOTKEY_ACCELERATED:
 			toggle_accelerated_speed();

diff --git a/src/hotkeys.hpp b/src/hotkeys.hpp
@@ -72,7 +72,8 @@ enum HOTKEY_COMMAND {
 	HOTKEY_REPLAY_SHOW_EACH, HOTKEY_REPLAY_SHOW_TEAM1,
 	HOTKEY_REPLAY_SKIP_ANIMATION,
 	HOTKEY_ANIMATE_MAP,
-	HOTKEY_LEFT_MOUSE_CLICK, HOTKEY_RIGHT_MOUSE_CLICK,
+	HOTKEY_SELECT_HEX, HOTKEY_DESELECT_HEX,
+	HOTKEY_MOVE_ACTION, HOTKEY_SELECT_AND_ACTION,
 	HOTKEY_CANCEL, HOTKEY_OKAY,
 
 	// Whiteboard commands
@@ -469,6 +470,10 @@ class command_executor
 	virtual void whiteboard_bump_up_action() {}
 	virtual void whiteboard_bump_down_action() {}
 	virtual void whiteboard_suppose_dead() {}
+	virtual void select_hex() {}
+	virtual void deselect_hex() {}
+	virtual void move_action() {}
+	virtual void select_and_action() {}
 	virtual void left_mouse_click() {}
 	virtual void right_mouse_click() {}
 	virtual void toggle_accelerated_speed() {}