diff --git a/src/sdl2/main.c b/src/sdl2/main.c
index 1c20e9ea746035dd0a8a49bec7beed072f86b99b..98fb2cf84ef2506bf1cb839b31c1e0f46c275ce5 100644 (file)
--- a/src/sdl2/main.c
+++ b/src/sdl2/main.c
#include "system.h"
#include "input.h"
-#include "cp866.h"
-
#include "player.h" // pl1 pl2
#include "menu.h" // G_keyf
#include "error.h" // logo
#include "music.h" // S_initmusic S_updatemusic S_donemusic
#include "render.h" // R_init R_draw R_done
+#include "common/cp866.h"
+
#define TITLE_STR "Doom 2D (SDL2)"
static Uint32 ticks;
vprintf(s, ap);
va_end(ap);
puts("");
- abort()
+ abort();
}
void ERR_fatal (char *s, ...) {
R_done();
MUS_done();
S_done();
- M_shutdown();
SDL_Quit();
puts("\nCRITICAL ERROR:");
va_start(ap, s);
pl2.kwr = KEY_2;
pl2.kp = KEY_E;
srand(SDL_GetTicks());
- F_startup();
CFG_load();
F_addwad("doom2d.wad");
F_initwads();
- M_startup();
- F_allocres();
S_init();
MUS_init();
R_init();
R_done();
MUS_done();
S_done();
- M_shutdown();
SDL_Quit();
return 0;
}