Merged with Aethyra master as of 2009-02-09

Conflicts:
	A lot of files...

1 files changed, 14 insertions, 6 deletions

diff --git a/src/keyboardconfig.h b/src/keyboardconfig.h
index ba249b87..8949a48e 100644
--- a/src/keyboardconfig.h
+++ b/src/keyboardconfig.h
@@ -22,13 +22,9 @@
 #ifndef KEYBOARDCONFIG_H
 #define KEYBOARDCONFIG_H
 
+#include <SDL_types.h>
 #include <string>
 
-#include <guichan/sdl/sdlinput.hpp>
-
-#include "gui/sdlinput.h"
-#include "gui/setup_keyboard.h"
-
 /**
  * Each key represents a key function. Such as 'Move up', 'Attack' etc.
  */
@@ -40,6 +36,8 @@ struct KeyFunction
     int value;                  /** The actual value that is used. */
 };
 
+class Setup_Keyboard;
+
 class KeyboardConfig
 {
     public:
@@ -148,7 +146,8 @@ class KeyboardConfig
          * The key assignment view gets arranged according to the order of
          * these values.
          */
-        enum KeyAction {
+        enum KeyAction
+        {
             KEY_NO_VALUE = -1,
             KEY_MOVE_UP,
             KEY_MOVE_DOWN,
@@ -164,6 +163,9 @@ class KeyboardConfig
             KEY_PICKUP,
             KEY_HIDE_WINDOWS,
             KEY_SIT,
+            KEY_SCREENSHOT,
+            KEY_TRADE,
+            KEY_PATHFIND,
             KEY_SHORTCUT_1,
             KEY_SHORTCUT_2,
             KEY_SHORTCUT_3,
@@ -176,6 +178,7 @@ class KeyboardConfig
             KEY_SHORTCUT_10,
             KEY_SHORTCUT_11,
             KEY_SHORTCUT_12,
+            KEY_WINDOW_HELP,
             KEY_WINDOW_STATUS,
             KEY_WINDOW_INVENTORY,
             KEY_WINDOW_EQUIPMENT,
@@ -199,6 +202,11 @@ class KeyboardConfig
             KEY_EMOTE_10,
             KEY_EMOTE_11,
             KEY_EMOTE_12,
+            KEY_TOGGLE_CHAT,
+            KEY_SCROLL_CHAT_UP,
+            KEY_SCROLL_CHAT_DOWN,
+            KEY_OK,
+            KEY_QUIT,
             KEY_TOTAL
         };