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

diff --git a/src/sdl2/main.c b/src/sdl2/main.c
index 67387db..98fb2cf 100644
--- a/src/sdl2/main.c
+++ b/src/sdl2/main.c
@@ -1,3 +1,18 @@
+/* Copyright (C) 2020 SovietPony
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License ONLY.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifdef __EMSCRIPTEN__
 #  include <emscripten.h>
 #endif
@@ -11,21 +26,22 @@
 #include "system.h"
 #include "input.h"
 
-#include "cp866.h"
-
-#include "my.h" // fexists
 #include "player.h" // pl1 pl2
 #include "menu.h" // G_keyf
 #include "error.h" // logo
+#include "monster.h" // nomon
 
 #include "files.h" // F_startup F_addwad F_initwads F_allocres
 #include "config.h" // CFG_args CFG_load CFG_save
+#include "args.h" // ARG_parse
 #include "memory.h" // M_startup
 #include "game.h" // G_init G_act
 #include "sound.h" // S_init S_done
 #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;
@@ -35,6 +51,60 @@ static SDL_GLContext context;
 static SDL_Surface *surf;
 static videomode_t vlist;
 
+static const cfg_t arg[] = {
+  {"file", NULL, Y_FILES},
+  {"cheat", &cheat, Y_SW_ON},
+//  {"vga", &shot_vga, Y_SW_ON},
+//  {"musvol", &mus_vol, Y_WORD},
+  {"mon", &nomon, Y_SW_OFF},
+  {"warp", &_warp, Y_BYTE},
+//  {"config", NULL, cfg_file, Y_STRING},
+  {NULL, NULL, 0} // end
+};
+
+static const cfg_t cfg[] = {
+//  {"screenshot", &shot_vga, Y_SW_ON},
+//  {"music_volume", &mus_vol, Y_WORD},
+//  {"music_random", &music_random, Y_SW_ON},
+//  {"music_time", &music_time, Y_DWORD},
+//  {"music_fade", &music_fade, Y_DWORD},
+  {"pl1_left", &pl1.kl, Y_KEY},
+  {"pl1_right",&pl1.kr, Y_KEY},
+  {"pl1_up", &pl1.ku, Y_KEY},
+  {"pl1_down", &pl1.kd, Y_KEY},
+  {"pl1_jump", &pl1.kj, Y_KEY},
+  {"pl1_fire", &pl1.kf, Y_KEY},
+  {"pl1_next", &pl1.kwr, Y_KEY},
+  {"pl1_prev", &pl1.kwl, Y_KEY},
+  {"pl1_use", &pl1.kp, Y_KEY},
+  {"pl2_left", &pl2.kl, Y_KEY},
+  {"pl2_right", &pl2.kr, Y_KEY},
+  {"pl2_up", &pl2.ku, Y_KEY},
+  {"pl2_down", &pl2.kd, Y_KEY},
+  {"pl2_jump", &pl2.kj, Y_KEY},
+  {"pl2_fire", &pl2.kf, Y_KEY},
+  {"pl2_next", &pl2.kwr, Y_KEY},
+  {"pl2_prev", &pl2.kwl, Y_KEY},
+  {"pl2_use", &pl2.kp, Y_KEY},
+  {NULL, NULL, 0} // end
+};
+
+static void CFG_args (int argc, char **argv) {
+  const cfg_t *list[] = { arg, R_args(), S_args(), MUS_args() };
+  ARG_parse(argc, argv, 4, list);
+}
+
+static void CFG_load (void) {
+  const cfg_t *list[] = { cfg, R_conf(), S_conf(), MUS_conf() };
+  CFG_read_config("default.cfg", 4, list);
+  CFG_read_config("doom2d.cfg", 4, list);
+}
+
+static void CFG_save (void) {
+  const cfg_t *list[] = { cfg, R_conf(), S_conf(), MUS_conf() };
+  CFG_update_config("doom2d.cfg", "doom2d.cfg", 4, list, "generated by doom2d, do not modify");
+}
+
 /* --- error.h --- */
 
 void logo (const char *s, ...) {
@@ -55,22 +125,21 @@ void ERR_failinit (char *s, ...) {
   vprintf(s, ap);
   va_end(ap);
   puts("");
-  exit(1);
+  abort();
 }
 
 void ERR_fatal (char *s, ...) {
   va_list ap;
   R_done();
+  MUS_done();
   S_done();
-  S_donemusic();
-  M_shutdown();
   SDL_Quit();
-  puts("\nКРИТИЧЕСКАЯ ОШИБКА:");
+  puts("\nCRITICAL ERROR:");
   va_start(ap, s);
   vprintf(s, ap);
   va_end(ap);
   puts("");
-  exit(1);
+  abort();
 }
 
 void ERR_quit (void) {
@@ -487,7 +556,7 @@ static void poll_events (void) {
 
 static void step (void) {
   poll_events();
-  S_updatemusic();
+  MUS_update();
   Uint32 t = SDL_GetTicks();
   if (t - ticks > DELAY) {
     ticks = t;
@@ -497,7 +566,7 @@ static void step (void) {
 }
 
 int main (int argc, char **argv) {
-  char *pw;
+  CFG_args(argc, argv);
   logo("system: initialize SDL2\n");
   if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO | SDL_INIT_EVENTS) == -1) {
     logo("system: failed to init SDL2: %s\n", SDL_GetError());
@@ -524,24 +593,11 @@ 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");
-  }
-  CFG_args(argc, argv);
   CFG_load();
+  F_addwad("doom2d.wad");
   F_initwads();
-  M_startup();
-  F_allocres();
   S_init();
-  S_initmusic();
+  MUS_init();
   R_init();
   G_init();
   ticks = SDL_GetTicks();
@@ -554,9 +610,8 @@ int main (int argc, char **argv) {
 #endif
   CFG_save();
   R_done();
-  S_donemusic();
+  MUS_done();
   S_done();
-  M_shutdown();
   SDL_Quit();
   return 0;
 }