list_actions, renamed thruster actions

1 files changed, 11 insertions, 0 deletions

diff --git a/src/client/keyboard.h b/src/client/keyboard.h
index 8275b1a..1c70179 100644
--- a/src/client/keyboard.h
+++ b/src/client/keyboard.h
@@ -9,9 +9,11 @@
 
 #include <string>
 #include <map>
+#include <list>
 
 #include "SDL/SDL.h"
 
+#include "client/action.h"
 #include "client/key.h"
 
 namespace client {
@@ -40,9 +42,15 @@ public:
 	/// list keyboard key names
 	void list_keys();
 
+	/// list actions
+	void list_actions();
+
 	/// list keyboard binds
 	void list_binds();
 
+	/// list binds for a singe key
+	void list_bind(std::string const &name);
+
 	/// load keyboard binds
 	void load_binds();
 
@@ -64,7 +72,10 @@ private:
 
 	void add_key(const char *name, const unsigned int keysym, const char ascii=0, const char *bind=0);
 
+	void add_action(const char *name, Action::Identifier action, const char *info = 0);
+
 	std::map<unsigned int, Key *> keys;
+	std::list<Action *> actions;
 
 	bool numlock;
 	bool capslock;