X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fsdl2%2Fmain.c;h=98fb2cf84ef2506bf1cb839b31c1e0f46c275ce5;hb=b7c6f2a0e12b4ee2d4111d1e671bf2b8b14c71b4;hp=1c20e9ea746035dd0a8a49bec7beed072f86b99b;hpb=10bdd396f0cd0ff1fc0a504cd41949ff39937b30;p=flatwaifu.git

diff --git a/src/sdl2/main.c b/src/sdl2/main.c
index 1c20e9e..98fb2cf 100644
--- a/src/sdl2/main.c
+++ b/src/sdl2/main.c
@@ -26,8 +26,6 @@
 #include "system.h"
 #include "input.h"
 
-#include "cp866.h"
-
 #include "player.h" // pl1 pl2
 #include "menu.h" // G_keyf
 #include "error.h" // logo
@@ -42,6 +40,8 @@
 #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;
@@ -125,7 +125,7 @@ void ERR_failinit (char *s, ...) {
   vprintf(s, ap);
   va_end(ap);
   puts("");
-  abort()
+  abort();
 }
 
 void ERR_fatal (char *s, ...) {
@@ -133,7 +133,6 @@ void ERR_fatal (char *s, ...) {
   R_done();
   MUS_done();
   S_done();
-  M_shutdown();
   SDL_Quit();
   puts("\nCRITICAL ERROR:");
   va_start(ap, s);
@@ -594,12 +593,9 @@ int main (int argc, char **argv) {
   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();
@@ -616,7 +612,6 @@ int main (int argc, char **argv) {
   R_done();
   MUS_done();
   S_done();
-  M_shutdown();
   SDL_Quit();
   return 0;
 }