Löse das Verzeichnis client/input auf

Makefile

@@ -183,6 +183,7 @@ CLIENT_OBJS = \
 	build/client/cl_entities.o \
 	build/client/cl_input.o \
 	build/client/cl_inventory.o \
+	build/client/cl_keyboard.o \
 	build/client/cl_lights.o \
 	build/client/cl_main.o \
 	build/client/cl_network.o \
@@ -193,7 +194,6 @@ CLIENT_OBJS = \
 	build/client/cl_screen.o \
 	build/client/cl_view.o \
 	build/client/console/console.o \
-	build/client/input/keyboard.o \
 	build/client/menu/menu.o \
 	build/client/menu/qmenu.o \
 	build/client/menu/videomenu.o \
@@ -462,7 +462,10 @@ build/client/cl_input.o :   		src/client/cl_input.c
 
 build/client/cl_inventory.o : 		src/client/cl_inventory.c
 	$(CC) $(CFLAGS_CLIENT) -o $@ -c $< 
-
+ 
+build/client/cl_keyboard.o : 		src/client/cl_keyboard.c
+	$(CC) $(CFLAGS_CLIENT) -o $@ -c $< 
+ 
 build/client/cl_lights.o :     		src/client/cl_lights.c
 	$(CC) $(CFLAGS_CLIENT) -o $@ -c $< 
  
@@ -493,9 +496,6 @@ build/client/cl_view.o :    		src/client/cl_view.c
 build/client/console/console.o :	src/client/console/console.c
 	$(CC) $(CFLAGS_CLIENT) -o $@ -c $<
 
-build/client/input/keyboard.o :		src/client/input/keyboard.c
-	$(CC) $(CFLAGS_CLIENT) -o $@ -c $< 
-
 build/client/menu/menu.o :			src/client/menu/menu.c
 	$(CC) $(CFLAGS_CLIENT) -o $@ -c $< 
 

src/client/cl_keyboard.c

@@ -21,11 +21,13 @@
  *
  * Upper layer of the keyboard implementation. This file processes all
  * keyboard events which are generated by the low level keyboard layer.
+ * Remeber, that the mouse is handled by the refresher and not by the
+ * client!
  *
  * =======================================================================
  */
 
-#include "../header/client.h"
+#include "header/client.h"
 
 /*
  * key up events are sent even if in console mode

src/client/header/client.h

@@ -56,10 +56,10 @@
 #include "ref.h"
 #include "vid.h"
 #include "screen.h"
+#include "input.h"
+#include "keyboard.h"
 
 #include "../console/header/console.h"
-#include "../input/header/input.h"
-#include "../input/header/keyboard.h"
 #include "../sound/header/cdaudio.h"
 #include "../sound/header/sound.h"
 #include "../sound/header/vorbis.h"

src/client/header/input.h

@@ -25,8 +25,8 @@
  * =======================================================================
  */
 
-#ifndef CL_INPUT_INPUT_H
-#define CL_INPUT_INPUT_H
+#ifndef CL_HEADER_INPUT_H
+#define CL_HEADER_INPUT_H
 
 void IN_Shutdown (void);
 

src/client/header/keyboard.h

@@ -24,8 +24,8 @@
  * =======================================================================
  */
 
-#ifndef CL_INPUT_KEYBOARD_H
-#define CL_INPUT_KEYBOARD_H
+#ifndef CL_HEADER_KEYBOARD_H
+#define CL_HEADER_KEYBOARD_H
 
 /* these are the key numbers that should be passed to Key_Event
    they must be mached by the low level key event processing! */

src/sdl/input.c

@@ -27,7 +27,7 @@
 
 #include <SDL.h>
 #include "../refresh/header/local.h"
-#include "../client/input/header/keyboard.h"
+#include "../client/header/keyboard.h"
 #include "../unix/header/unix.h"
 
 #define MOUSE_MAX 3000