X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FKeymap.hpp;h=a3e1d436766b62d828d88d341c449da6cd28ed29;hb=56069d41c1553d87a8759713ef391d3a908adc0e;hp=0e34ba9979d2406a78b98e91171e242702c0bcda;hpb=dbfcb12348b80e2582f710acb1e4ed0011889ba2;p=blank.git

diff --git a/src/ui/Keymap.hpp b/src/ui/Keymap.hpp
index 0e34ba9..a3e1d43 100644
--- a/src/ui/Keymap.hpp
+++ b/src/ui/Keymap.hpp
@@ -21,18 +21,26 @@ public:
 		MOVE_UP,
 		MOVE_DOWN,
 
-		BLOCK_FACE,
-		BLOCK_TURN,
-		BLOCK_NEXT,
-		BLOCK_PREV,
+		PRIMARY,
+		SECONDARY,
+		TERTIARY,
+
+		INV_NEXT,
+		INV_PREVIOUS,
+		INV_1,
+		INV_2,
+		INV_3,
+		INV_4,
+		INV_5,
+		INV_6,
+		INV_7,
+		INV_8,
+		INV_9,
+		INV_10,
 
-		BLOCK_PLACE,
-		BLOCK_PICK,
-		BLOCK_REMOVE,
-
-		TOGGLE_COLLISION,
 		TOGGLE_AUDIO,
-		TOGGLE_VISUAL,
+		TOGGLE_VIDEO,
+		TOGGLE_HUD,
 		TOGGLE_DEBUG,
 
 		EXIT,
@@ -45,9 +53,9 @@ public:
 	Keymap();
 
 	void Map(SDL_Scancode scancode, Action);
-	Action Lookup(SDL_Scancode scancode);
-	Action Lookup(const SDL_Keysym &s) { return Lookup(s.scancode); }
-	Action Lookup(const SDL_KeyboardEvent &e) { return Lookup(e.keysym); }
+	Action Lookup(SDL_Scancode scancode) const;
+	Action Lookup(const SDL_Keysym &s) const { return Lookup(s.scancode); }
+	Action Lookup(const SDL_KeyboardEvent &e) const { return Lookup(e.keysym); }
 
 	void LoadDefault();