X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fsdl%2Fmain.c;h=2243ce07cdf74ecc3f545e29e7d4e22fda73c6e0;hb=30a1e51f4672eed675ef310d67adabc36e3146fc;hp=2c229fb3c77942ba0c9e055821ee1ff8ccb05dfb;hpb=9df860ab2839447c7143bbe705a573df152d7734;p=flatwaifu.git

diff --git a/src/sdl/main.c b/src/sdl/main.c
index 2c229fb..2243ce0 100644
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
@@ -25,7 +25,6 @@
 #include "system.h"
 #include "input.h"
 
-#include "my.h" // fexists
 #include "player.h" // pl1 pl2
 #include "menu.h" // G_keyf
 #include "error.h" // logo
@@ -133,7 +132,6 @@ void ERR_fatal (char *s, ...) {
   R_done();
   MUS_done();
   S_done();
-  M_shutdown();
   SDL_Quit();
   puts("\nCRITICAL ERROR:");
   va_start(ap, s);
@@ -482,7 +480,6 @@ static void step (void) {
 }
 
 int main (int argc, char *argv[]) {
-  char *pw;
   logo("main: initialize SDL\n");
   if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) == -1) {
     logo("main: failed to init SDL: %s\n", SDL_GetError());
@@ -510,22 +507,10 @@ int main (int argc, char *argv[]) {
   pl2.kwr = KEY_2;
   pl2.kp = KEY_E;
   srand(SDL_GetTicks());
-  F_startup();
-#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");
-  }
+  F_addwad("doom2d.wad");
   CFG_args(argc, argv);
   CFG_load();
   F_initwads();
-  M_startup();
-  F_allocres();
   S_init();
   MUS_init();
   R_init();
@@ -542,7 +527,6 @@ int main (int argc, char *argv[]) {
   R_done();
   MUS_done();
   S_done();
-  M_shutdown();
   SDL_Quit();
   return 0;
 }