X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fconfig.c;h=0c5bc21868319394f1645d5d800437f29bcb6588;hb=2bb81ea2565c3627c954b5c37326db89b0048472;hp=2bf7f731dfac80c223640c4cbb8faa794be4ba6d;hpb=e5c2eddc151a59db4e611a77901732d7c15fde90;p=flatwaifu.git

diff --git a/src/config.c b/src/config.c
index 2bf7f73..0c5bc21 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 <SDL_keyboard.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 "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},
@@ -60,11 +58,11 @@ static cfg_t cfg[]={
   {"vga","screenshot",&shot_vga,SW_ON,0},
   {"sndvol","sound_volume",&snd_vol,WORD,0},
   {"musvol","music_volume",&mus_vol,WORD,0},
-  {"fullscr","fullscreen",&fullscreen,SW_ON,0},
-  {"window",NULL,&fullscreen,SW_OFF,0},
+//  {"fullscr","fullscreen",&fullscreen,SW_ON,0},
+//  {"window",NULL,&fullscreen,SW_OFF,0},
   {NULL,"sky",&w_horiz,SW_ON,0},
   {"mon",NULL,&nomon,SW_OFF,0},
-  {"gamma","gamma",&gammaa,DWORD,0},
+//  {"gamma","gamma",&gammaa,DWORD,0},
   {"warp",NULL,&_warp,BYTE,0},
   {"width","screen_width",&SCRW,DWORD,0},
   {"height","screen_height",&SCRH,DWORD,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,8 +154,7 @@ next:
   }
 }
 
-int get_key(char *name)
-{
+static int get_key (char *name) {
     int i;
     for(i=1; i<SDLK_LAST; i++) {
         char* s = SDL_GetKeyName(i);