diff --git a/src/config.c b/src/config.c
index 4989e29f153e251f6d6e757b84f5ac67a6c46c33..d0c4a9f1322545d2e9b87591a195d8ac6c82bdd0 100644 (file)
--- a/src/config.c
+++ b/src/config.c
#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>
{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}
};
-char cfg_file[128]="DEFAULT.CFG";
+char cfg_file[128]="default.cfg";
static char buf[256];
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)) {