X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=c51e9eeb65d3b435004c299acc12bbf26d014fc4;hb=a100ff401dc739ae0e57fdbda1848f4db1a24b81;hp=9ad78cb2037bc09deb995d76d6258b07fc9f0ff2;hpb=584adc9c1911a6941ef07443a6fc6ff922d7c8ea;p=flatwaifu.git

diff --git a/src/config.c b/src/config.c
index 9ad78cb..c51e9ee 100644
--- a/src/config.c
+++ b/src/config.c
@@ -24,20 +24,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "config.h"
-//#include "vga.h"
-#include "error.h"
+#include "map.h"
 #include "sound.h"
-#include "files.h"
+#include "music.h"
 #include "view.h"
+#include "monster.h"
 #include "player.h"
+#include "menu.h"
+#include "files.h"
+#include "render.h"
+#include "error.h"
+#include "input.h"
 #include "my.h"
 
-#include <SDL_keyboard.h>
-
-extern byte _warp,fastdraw,nomon;
-extern int mem_chk_sz;
-
 enum{NONE,BYTE,WORD,DWORD,STRING,SW_ON,SW_OFF,FILES,KEY};
 
 typedef struct{
@@ -46,13 +45,12 @@ typedef struct{
   byte t,o;
 }cfg_t;
 
-
 byte cheat=0;
-
 byte shot_vga=0;
-
-
 char cd_path[128]="";
+char cfg_file[128]="default.cfg";
+
+static char buf[256];
 
 static cfg_t cfg[]={
   {"file",NULL,NULL,FILES,0},
@@ -93,11 +91,6 @@ static cfg_t cfg[]={
   {NULL,NULL,NULL,NONE,0}
 };
 
-
-char cfg_file[128]="default.cfg";
-
-static char buf[256];
-
 void CFG_args(int argc, char *argv[]) {
   int j;
   dword n;
@@ -161,19 +154,6 @@ next:
   }
 }
 
-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;
@@ -243,19 +223,15 @@ void CFG_load(void) {
             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 {
+                int i;
                 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));
                 }
               }
           }