X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=ceba8877cee66ffcd752e83428c160f18dc918d5;hb=534310c1f131bb9a53be865c32d90342ed026734;hp=54b2af66bc021a0f5e72bf728ca3e0246434416d;hpb=a2115940e7643dcb1b87286f3d19fe95f7b79bd3;p=flatwaifu.git

diff --git a/src/main.c b/src/main.c
index 54b2af6..ceba887 100644
--- a/src/main.c
+++ b/src/main.c
@@ -22,13 +22,8 @@
 
 #include "glob.h"
 #include <stdio.h>
-///#include <process.h>
 #include <stdarg.h>
-///#include <conio.h>
-#include <time.h>
-///#include <dos.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <string.h>
 #include "error.h"
 #include "config.h"
@@ -40,7 +35,7 @@
 #include "view.h"
 #include "menu.h"
 #include "player.h"
-#include "misc.h"
+#include "my.h"
 
 #include <SDL.h>
 
@@ -112,7 +107,16 @@ int main(int argc, char *argv[]) {
   pl2.id=-2;
   myrandomize();
   F_startup();
-  F_addwad("doom2d.wad");
+  char *pw;
+#ifndef WIN32 
+  pw = "/usr/share/doom2d-rembo/doom2d.wad";
+#else
+  pw = "doom2d.wad";
+#endif
+  if (fexists(pw))
+    F_addwad(pw);
+  else
+    F_addwad("doom2d.wad");
   CFG_args(argc, argv);
   CFG_load();
   F_initwads();
@@ -124,6 +128,7 @@ int main(int argc, char *argv[]) {
   F_loadres(F_getresid("MIXMAP"),mixmap,0,0x10000);
   F_loadres(F_getresid("COLORMAP"),clrmap,0,256*12);
   G_init();
+  R_alloc();
   K_init();
   logo("S_init: настройка звука\n");
   S_init();