X-Git-Url: https://deadsoftware.ru/gitweb?p=flatwaifu.git;a=blobdiff_plain;f=src%2Fsdl2%2Fmain.c;h=6044bfc7ecad9e6be1359b507714b3e2040a9422;hp=37b4c26334bfdd97514161b68610c5152d2fb18b;hb=4a99fe51561ca331df54512eb25c502d0fcd2b55;hpb=49c7dbd3920be7bb57a9ec39779d9695fbe8f0c5

diff --git a/src/sdl2/main.c b/src/sdl2/main.c
index 37b4c26..6044bfc 100644
--- a/src/sdl2/main.c
+++ b/src/sdl2/main.c
@@ -21,6 +21,7 @@
 
 #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
@@ -40,31 +41,19 @@ static const cfg_t arg[] = {
   {"file", NULL, Y_FILES},
   {"cheat", &cheat, Y_SW_ON},
 //  {"vga", &shot_vga, Y_SW_ON},
-  {"sndvol", &snd_vol, Y_WORD},
-  {"musvol", &mus_vol, Y_WORD},
-//  {"fullscr", &fullscreen, Y_SW_ON},
-//  {"window", &fullscreen, Y_SW_OFF},
+//  {"musvol", &mus_vol, Y_WORD},
   {"mon", &nomon, Y_SW_OFF},
-//  {"gamma", &gammaa, Y_DWORD},
   {"warp", &_warp, Y_BYTE},
-//  {"width", &SCRW, Y_DWORD},
-//  {"height", &SCRH, Y_DWORD},
 //  {"config", NULL, cfg_file, Y_STRING},
   {NULL, NULL, 0} // end
 };
 
 static const cfg_t cfg[] = {
 //  {"screenshot", &shot_vga, Y_SW_ON},
-  {"sound_volume", &snd_vol, Y_WORD},
-  {"music_volume", &mus_vol, Y_WORD},
-//  {"fullscreen", &fullscreen, Y_SW_ON},
-  {"sky", &w_horiz, Y_SW_ON},
-//  {"gamma", &gammaa, Y_DWORD},
-//  {"screen_width", &SCRW, Y_DWORD},
-//  {"screen_height", &SCRH, Y_DWORD},
-  {"music_random", &music_random, Y_SW_ON},
-  {"music_time", &music_time, Y_DWORD},
-  {"music_fade", &music_fade, Y_DWORD},
+//  {"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},
@@ -87,34 +76,19 @@ static const cfg_t cfg[] = {
 };
 
 static void CFG_args (int argc, char **argv) {
-  int i;
-  for (i = 1; i < argc; i++) {
-    if (argv[i][0] == '-' && argv[i][1] != 0) {
-      if (i + 1 >= argc) {
-        ERR_failinit("CFG_args: not enough arguments for parameter %s\n", argv[i]);
-      } else {
-        if (CFG_update_key(&argv[i][1], argv[i + 1], arg) != 0) {
-          ERR_failinit("CFG_args: unknown parameter %s\n", argv[i]);
-        }
-        i += 1;
-      }
-    } else {
-      ERR_failinit("CFG_args: something wrong here: %s\n", argv[i]);
-    }
-  }
+  const cfg_t *list[] = { arg, R_args(), S_args(), MUS_args() };
+  ARG_parse(argc, argv, 4, list);
 }
 
 static void CFG_load (void) {
-  CFG_read_config("default.cfg", cfg);
-  CFG_read_config("doom2d.cfg", cfg);
+  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, NULL };
-  CFG_update_config("doom2d.cfg", "doom2d.cfg", 1, list, "generated by doom2d, do not modify");
-  //CFG_update_config("doom2d.cfg", "doom2d.tmp", cfg, "temporary file");
-  //CFG_update_config("doom2d.tmp", "doom2d.cfg", cfg, "generated by doom2d, do not modify");
-  //remove("doom2d.tmp");
+  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 --- */
@@ -143,8 +117,8 @@ void ERR_failinit (char *s, ...) {
 void ERR_fatal (char *s, ...) {
   va_list ap;
   R_done();
+  MUS_done();
   S_done();
-  S_donemusic();
   M_shutdown();
   SDL_Quit();
   puts("\nКРИТИЧЕСКАЯ ОШИБКА:");
@@ -569,7 +543,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;
@@ -580,6 +554,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());
@@ -607,6 +582,7 @@ int main (int argc, char **argv) {
   pl2.kp = KEY_E;
   srand(SDL_GetTicks());
   F_startup();
+  CFG_load();
 #ifndef WIN32
   pw = "/usr/share/doom2d-rembo/doom2d.wad";
 #else
@@ -617,13 +593,11 @@ int main (int argc, char **argv) {
   } else {
     F_addwad("doom2d.wad");
   }
-  CFG_args(argc, argv);
-  CFG_load();
   F_initwads();
   M_startup();
   F_allocres();
   S_init();
-  S_initmusic();
+  MUS_init();
   R_init();
   G_init();
   ticks = SDL_GetTicks();
@@ -636,7 +610,7 @@ int main (int argc, char **argv) {
 #endif
   CFG_save();
   R_done();
-  S_donemusic();
+  MUS_done();
   S_done();
   M_shutdown();
   SDL_Quit();