Merge mouse move feature.

CleverRaven · Nov 19, 2013 · e585b53 · e585b53
2 parents 45d91bb + e32a901
commit e585b53
Show file tree

Hide file tree

Showing 10 changed files with 383 additions and 84 deletions.
diff --git a/data/raw/keybindings.json b/data/raw/keybindings.json
@@ -366,6 +366,16 @@
             }
         ]
     },
+    {
+        "id":"SEC_SELECT",
+        "name":"Select",
+        "bindings":[
+            {
+                "input_method":"mouse",
+                "key":"MOUSE_RIGHT"
+            }
+        ]
+    },
     {
         "id":"SELECT",
         "name":"Select",
@@ -396,5 +406,15 @@
                 "key":"f"
             }
         ]
+    },
+    {
+        "id":"TOGGLE_SNAP_TO_TARGET",
+        "name":"Toggle Snap to Target",
+        "bindings":[
+            {
+                "input_method":"keyboard",
+                "key":"*"
+            }
+        ]
     }
 ]
diff --git a/src/action.cpp b/src/action.cpp
@@ -758,3 +758,23 @@ std::string press_x(action_id act, std::string act_desc)
     }
 }
 
+action_id get_movement_direction_from_delta(const int dx, const int dy)
+{
+    if (dx == 0 && dy == -1) {
+        return ACTION_MOVE_N;
+    } else if (dx == 1 && dy == -1) {
+        return ACTION_MOVE_NE;
+    } else if (dx == 1 && dy == 0) {
+        return ACTION_MOVE_E;
+    } else if (dx == 1 && dy == 1) {
+        return ACTION_MOVE_SE;
+    } else if (dx == 0 && dy == 1) {
+        return ACTION_MOVE_S;
+    } else if (dx == -1 && dy == 1) {
+        return ACTION_MOVE_SW;
+    } else if (dx == -1 && dy == 0) {
+        return ACTION_MOVE_W;
+    } else {
+        return ACTION_MOVE_NW;
+    }
+}
diff --git a/src/action.h b/src/action.h
@@ -120,5 +120,7 @@ std::string press_x(action_id act, std::string key_bound_pre,
  // ('Z'ing|zing) (X( or Y)))
 std::string press_x(action_id act, std::string act_desc);
 
+// Helper function to convert co-ordinate delta to a movement direction
+action_id get_movement_direction_from_delta(const int dx, const int dy);
 
 #endif