diff --git a/src/sdl/main.c b/src/sdl/main.c
index 9227725c9876a90f48dd1c9380ab3695acda90ae..2df46b3fb96cdc76a92b6e799f72878b45493c2f 100644 (file)
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h> // srand exit
-#include <string.h> // strcasecmp
-#include <ctype.h>
#include <assert.h>
#include "system.h"
#include "input.h"
#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
static int text_input;
static videomode_t vlist;
+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},
+ {"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},
+ {"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) {
+ 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]);
+ }
+ }
+}
+
+static void CFG_load (void) {
+ CFG_read_config("default.cfg", cfg);
+ CFG_read_config("doom2d.cfg", cfg);
+}
+
+static void CFG_save (void) {
+ CFG_update_config("doom2d.cfg", "doom2d.cfg", cfg, "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");
+}
+
/* --- error.h --- */
void logo (const char *s, ...) {