Cleanup includes

[flatwaifu.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index bc498c63b92ba5ea58a93404095ccce80805b520..d0c4a9f1322545d2e9b87591a195d8ac6c82bdd0 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -24,17 +24,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-//#include <process.h>
-//#include <dos.h>
 #include "config.h"
 #include "vga.h"
 #include "error.h"
 #include "sound.h"
-#include "keyb.h"
 #include "files.h"
-#include "memory.h"
 #include "view.h"
 #include "player.h"
+#include "my.h"
 
 #include <SDL_keyboard.h>
 
@@ -93,7 +90,7 @@ static cfg_t cfg[]={
   {NULL,"pl2_prev", &pl2.kwl,KEY,0},
   {NULL,"pl2_use",  &pl2.kp,KEY,0},
   {"config",NULL,cfg_file,STRING,0},
-  {NULL,NULL,NONE,0}
+  {NULL,NULL,NULL,NONE,0}
 };
 
 
@@ -184,8 +181,23 @@ void CFG_load(void) {
   char s[128];
   char *p1,*p2;
 
-  logo("CFG_load: загрузка конфигурации из %s\n",cfg_file);
-  if((h=fopen(cfg_file,"rb"))==NULL) {
+  char pc[50];
+  char *e = getenv("HOME");
+  strncpy(pc, e, 30);
+  strcpy(&pc[strlen(pc)], "/default.cfg");
+  if (!fexists(pc)) {
+      strcpy(pc, "default.cfg");
+      if (!fexists(pc)) {
+          strcpy(pc, "/usr/share/doom2d-rembo/default.cfg");
+          if (!fexists(pc)) {
+              logo("default.cfg not found\n");
+              return;
+          }
+      }
+  }
+
+  logo("CFG_load: загрузка конфигурации из %s\n",pc);
+  if((h=fopen(pc,"rb"))==NULL) {
     perror("Cannot open file");return;
   }
   while(!feof(h)) {