X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fui%2FKeymap.hpp;h=c74308018de5add44c923416b8782dbefa761b3a;hb=f1f8941a3f682fb589cf3c620fc7e7602cfc0f7f;hp=e96179ae9c4f8bce945251560163bb0125617fb1;hpb=82ec71079e4763f2b2d66c0c210e37df40c89034;p=blank.git

diff --git a/src/ui/Keymap.hpp b/src/ui/Keymap.hpp
index e96179a..c743080 100644
--- a/src/ui/Keymap.hpp
+++ b/src/ui/Keymap.hpp
@@ -21,24 +21,28 @@ 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,
-
-		PRINT_BLOCK,
-		PRINT_CHUNK,
-		PRINT_LIGHT,
-		PRINT_SELECTION,
+		CAMERA_NEXT,
 
 		EXIT,
 	};
@@ -50,9 +54,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();