X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fsdl%2Fmain.c;h=23f331175700a01b6a4522245248b166464d2b1c;hb=10bdd396f0cd0ff1fc0a504cd41949ff39937b30;hp=217890a0425ece6750a72a493ab714a3fdb1463c;hpb=5ffa796498caf6ade53096515965d5eec272799e;p=flatwaifu.git

diff --git a/src/sdl/main.c b/src/sdl/main.c
index 217890a..23f3311 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
@@ -125,7 +124,7 @@ void ERR_failinit (char *s, ...) {
   vprintf(s, ap);
   va_end(ap);
   puts("");
-  exit(1);
+  abort();
 }
 
 void ERR_fatal (char *s, ...) {
@@ -140,7 +139,7 @@ void ERR_fatal (char *s, ...) {
   vprintf(s, ap);
   va_end(ap);
   puts("");
-  exit(1);
+  abort();
 }
 
 void ERR_quit (void) {
@@ -482,7 +481,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());
@@ -511,16 +509,7 @@ int main (int argc, char *argv[]) {
   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();