config: read config and args by renders

[flatwaifu.git] / src / sdl / main.c

diff --git a/src/sdl/main.c b/src/sdl/main.c
index a440844bc274744a8556da2b370e14e3f59fec15..1c16dc33307100048c40af58c3a38ee2060b7319 100644 (file)
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
@@ -40,6 +40,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
@@ -63,13 +64,8 @@ static const cfg_t arg[] = {
 //  {"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},
   {"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
 };
@@ -78,11 +74,6 @@ 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},
@@ -108,34 +99,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() };
+  ARG_parse(argc, argv, 2, 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() };
+  CFG_read_config("default.cfg", 2, list);
+  CFG_read_config("doom2d.cfg", 2, 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() };
+  CFG_update_config("doom2d.cfg", "doom2d.cfg", 2, list, "generated by doom2d, do not modify");
 }
 
 /* --- error.h --- */