diff --git a/src/config.c b/src/config.c
index 0c5bc21868319394f1645d5d800437f29bcb6588..c51e9eeb65d3b435004c299acc12bbf26d014fc4 100644 (file)
--- a/src/config.c
+++ b/src/config.c
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <SDL_keyboard.h>
#include "map.h"
#include "sound.h"
#include "music.h"
#include "map.h"
#include "sound.h"
#include "music.h"
#include "files.h"
#include "render.h"
#include "error.h"
#include "files.h"
#include "render.h"
#include "error.h"
+#include "input.h"
#include "my.h"
enum{NONE,BYTE,WORD,DWORD,STRING,SW_ON,SW_OFF,FILES,KEY};
#include "my.h"
enum{NONE,BYTE,WORD,DWORD,STRING,SW_ON,SW_OFF,FILES,KEY};
}
}
}
}
-static int get_key (char *name) {
- int i;
- for(i=1; i<SDLK_LAST; i++) {
- char* s = SDL_GetKeyName(i);
- if (s && strcasecmp(name,s) == 0) {
-
- return i;
- }
- }
- return 0;
-}
-
void CFG_load(void) {
int j;
FILE *h;
void CFG_load(void) {
int j;
FILE *h;
break;
case KEY:
{
break;
case KEY:
{
- int k = get_key(p2);
- if (k) {
- *((int *)cfg[j].p)=k;
+ int k = I_string_to_key(p2);
+ if (k != KEY_UNKNOWN) {
+ *((int *)cfg[j].p)=k;
} else {
} else {
+ int i;
logo("Unknown key in cfg: %s=%s\n",p1,p2);
logo("List available key names:\n");
logo("Unknown key in cfg: %s=%s\n",p1,p2);
logo("List available key names:\n");
- int i;
- for(i=1; i<SDLK_LAST; i++) {
- char* s = SDL_GetKeyName(i);
-
- if (!strcasecmp(s,"unknown key") == 0) {
- logo("%s\n", s);
- }
+ for(i = 1; i <= KEY__LAST; i++) {
+ logo(" %s\n", I_key_to_string(i));
}
}
}
}
}
}