diff --git a/src/sdl/main.c b/src/sdl/main.c
index 217890a0425ece6750a72a493ab714a3fdb1463c..2243ce07cdf74ecc3f545e29e7d4e22fda73c6e0 100644 (file)
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
#include "system.h"
#include "input.h"
-#include "my.h" // fexists
#include "player.h" // pl1 pl2
#include "menu.h" // G_keyf
#include "error.h" // logo
vprintf(s, ap);
va_end(ap);
puts("");
- exit(1);
+ abort();
}
void ERR_fatal (char *s, ...) {
R_done();
MUS_done();
S_done();
- M_shutdown();
SDL_Quit();
puts("\nCRITICAL ERROR:");
va_start(ap, s);
vprintf(s, ap);
va_end(ap);
puts("");
- exit(1);
+ abort();
}
void ERR_quit (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());
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();
R_done();
MUS_done();
S_done();
- M_shutdown();
SDL_Quit();
return 0;
}