3 files changed, 4 insertions, 164 deletions
diff --git a/src/client/game.c b/src/client/game.c
index 7eaab20..8cc1a3b 100644
--- a/src/client/game.c
+++ b/src/client/game.c
@@ -20,7 +20,7 @@
 #include "interface.h"
 #include "screen.h"
 #include "font.h"
-#include "keytable.h"
+#include "screen_settingKeys.h"
 #include "language.h"
 #include "panel.h"
 #include "radar.h"
@@ -35,6 +35,7 @@
 #include "screen_mainMenu.h"
 #include "screen_analyze.h"
 #include "screen_setting.h"
+#include "screen_settingKeys.h"
 #include "screen_gameType.h"
 #include "screen_choiceArena.h"
 #include "screen_table.h"
@@ -72,6 +73,7 @@ static void initGame()
 	initScreenMainMenu();
 	initScreenAnalyze();
 	initScreenSetting();
+	initScreenSettingKeys();
 	initScreenGameType();
 	initScreenChoiceArena();
 	initScreenCredits();
@@ -102,6 +104,7 @@ void quitGame()
 	quitScreenMainMenu();
 	quitScreenAnalyze();
 	quitScreenSetting();
+	quitScreenSettingKeys();
 	quitScreenGameType();
 	quitScreenChoiceArena();
 	quitScreenCredits();
diff --git a/src/client/keytable.c b/src/client/keytable.c
deleted file mode 100644
index 672148b..0000000
--- a/src/client/keytable.c
+++ /dev/null
@@ -1,136 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "main.h"
-#include "list.h"
-#include "homeDirector.h"
-#include "textFile.h"
-
-#include "keytable.h"
-#include "configFile.h"
-
-static textFile_t *keytableFile;
-static textFile_t *keycontrolFile;
-static int keytable[KEY_LENGTH];
-
-static int getKeyCode(char *s)
-{
-	char str[STR_SIZE];
-	char *find;
-	int i;
-	
-	sprintf(str, "keycode %s = ", s);
-	
-	for( i = 0 ; i < keytableFile->text->count ; i++ )
-	{
-		char *line;
-		line = (char *) (keytableFile->text->list[i]);
-
-		if( ( find = strstr(line, str) ) != NULL )
-		{
-			int ret;
-			ret = atoi( strchr(line, '=')+1 );
-			return ret;
-		}
-	}
-
-	return -1;
-}
-
-void initKeyTable()
-{
-	char path[STR_PATH_SIZE];
-	char val[STR_SIZE];
-/*
-	int i;
-*/
-	sprintf(path, PATH_CONFIG "keytable.conf");
-	keytableFile = loadTextFile(path);
-
-	if( keytableFile == NULL )
-	{
-		fprintf(stderr, "Don't load %s\n", path);
-		return;
-	}
-
-	sprintf(path, "%s/keycontrol.conf", getHomeDirector());
-	keycontrolFile = loadTextFile(path);
-
-	if( keycontrolFile == NULL )
-	{
-		fprintf(stderr, "Don't load %s\n", path);
-		fprintf(stderr, "I create %s\n", path);
-
-		keycontrolFile = newTextFile(path);
-	}
-
-	if( keycontrolFile == NULL )
-	{
-		fprintf(stderr, "Don't create %s\n", path);
-		return;
-	}
-
-	loadValueFromConfigFile(keycontrolFile, "TUX_RIGHT_MOVE_UP", val, STR_SIZE, "SDLK_UP");
-	keytable[ KEY_TUX_RIGHT_MOVE_UP ] = getKeyCode(val);
-
-	loadValueFromConfigFile(keycontrolFile, "TUX_RIGHT_MOVE_RIGHT", val, STR_SIZE, "SDLK_RIGHT");
-	keytable[ KEY_TUX_RIGHT_MOVE_RIGHT ] = getKeyCode(val);
-
-	loadValueFromConfigFile(keycontrolFile, "TUX_RIGHT_MOVE_LEFT", val, STR_SIZE, "SDLK_LEFT");
-	keytable[ KEY_TUX_RIGHT_MOVE_LEFT ] = getKeyCode(val);
-
-	loadValueFromConfigFile(keycontrolFile, "TUX_RIGHT_MOVE_DOWN", val, STR_SIZE, "SDLK_DOWN");
-	keytable[ KEY_TUX_RIGHT_MOVE_DOWN ] = getKeyCode(val);
-
-	loadValueFromConfigFile(keycontrolFile, "TUX_RIGHT_SHOOT", val, STR_SIZE, "SDLK_KP0");
-	keytable[ KEY_TUX_RIGHT_SHOOT ] = getKeyCode(val);
-
-	loadValueFromConfigFile(keycontrolFile, "TUX_RIGHT_SWITCH_WEAPON", val, STR_SIZE, "SDLK_KP1");
-	keytable[ KEY_TUX_RIGHT_SWITCH_WEAPON] = getKeyCode(val);
-
-	loadValueFromConfigFile(keycontrolFile, "TUX_LEFT_MOVE_UP", val, STR_SIZE, "SDLK_w");
-	keytable[ KEY_TUX_LEFT_MOVE_UP ] = getKeyCode(val);
-
-	loadValueFromConfigFile(keycontrolFile, "TUX_LEFT_MOVE_RIGHT", val, STR_SIZE, "SDLK_d");
-	keytable[ KEY_TUX_LEFT_MOVE_RIGHT ] = getKeyCode(val);
-
-	loadValueFromConfigFile(keycontrolFile, "TUX_LEFT_MOVE_LEFT", val, STR_SIZE, "SDLK_a");
-	keytable[ KEY_TUX_LEFT_MOVE_LEFT ] = getKeyCode(val);
-
-	loadValueFromConfigFile(keycontrolFile, "TUX_LEFT_MOVE_DOWN", val, STR_SIZE, "SDLK_s");
-	keytable[ KEY_TUX_LEFT_MOVE_DOWN ] = getKeyCode(val);
-
-	loadValueFromConfigFile(keycontrolFile, "TUX_LEFT_SHOOT", val, STR_SIZE, "SDLK_q");
-	keytable[ KEY_TUX_LEFT_SHOOT ] = getKeyCode(val);
-
-	loadValueFromConfigFile(keycontrolFile, "TUX_LEFT_SWITCH_WEAPON", val, STR_SIZE, "SDLK_TAB");
-	keytable[ KEY_TUX_LEFT_SWITCH_WEAPON ] = getKeyCode(val);
-
-/*
-	for( i = 0 ; i < KEY_LENGTH ; i++)
-	{
-		printf("keytable[%d] = %d\n", i, keytable[i]);
-	}
-*/
-
-	saveTextFile(keycontrolFile);
-}
-
-int getKey(int n)
-{
-	assert( n >= 0 && n < KEY_LENGTH );
-/*
-	printf("keytable[n] = %d\n", keytable[n]);
-*/
-	return keytable[n];
-}
-
-void quitKeyTable()
-{
-	destroyTextFile(keycontrolFile);
-	destroyTextFile(keytableFile);
-}
-
diff --git a/src/client/keytable.h b/src/client/keytable.h
deleted file mode 100644
index 80ca258..0000000
--- a/src/client/keytable.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef KEYTABLE_H
-
-#define KEYTABLE_H
-
-#define KEY_LENGTH	12
-
-#define KEY_TUX_RIGHT_MOVE_UP		0
-#define KEY_TUX_RIGHT_MOVE_RIGHT	1
-#define KEY_TUX_RIGHT_MOVE_LEFT		2
-#define KEY_TUX_RIGHT_MOVE_DOWN		3
-#define KEY_TUX_RIGHT_SHOOT		4
-#define KEY_TUX_RIGHT_SWITCH_WEAPON	5
-#define KEY_TUX_LEFT_MOVE_UP		6
-#define KEY_TUX_LEFT_MOVE_RIGHT		7
-#define KEY_TUX_LEFT_MOVE_LEFT		8
-#define KEY_TUX_LEFT_MOVE_DOWN		9
-#define KEY_TUX_LEFT_SHOOT		10
-#define KEY_TUX_LEFT_SWITCH_WEAPON	11
-
-extern void initKeyTable();
-extern int getKey(int n);
-extern void quitKeyTable();
-
-#endif
-
-