X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fsdl2%2Fmain.c;h=ae80fe9d6dd8c62f8993994620a0204fe846943d;hb=9e7ef91e1f6a1eb4c65ba52535d92eac3922f20e;hp=5b111de3af1ca4196a4165bed012aad3849a7dd6;hpb=02f89a09888d2aab62c7bd92b8d3ac33fcd0c0ab;p=flatwaifu.git

diff --git a/src/sdl2/main.c b/src/sdl2/main.c
index 5b111de..ae80fe9 100644
--- a/src/sdl2/main.c
+++ b/src/sdl2/main.c
@@ -17,6 +17,7 @@
 #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
@@ -35,6 +36,86 @@ 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},
+  {"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, ...) {
@@ -454,37 +535,6 @@ static int utf8_to_wchar (char *x) {
   return i;
 }
 
-static int wchar_to_cp866 (int uch) {
-  if (uch <= 0x7f) {
-    return uch;
-  } else if (uch >= 0x410 && uch <= 0x43f) {
-    return uch - 0x410 + 0x80;
-  } else if (uch >= 0x440 && uch <= 0x44f) {
-    return uch - 0x440 + 0xe0;
-  } else {
-    switch (uch) {
-      // TODO graphics from 0xb0..0xdf
-      case 0x401: return 0xf0;
-      case 0x451: return 0xf1;
-      case 0x404: return 0xf2;
-      case 0x454: return 0xf3;
-      case 0x407: return 0xf4;
-      case 0x457: return 0xf5;
-      case 0x40e: return 0xf6;
-      case 0x45e: return 0xf7;
-      case 0xb0: return 0xf8;
-      case 0x2219: return 0xf9;
-      case 0xb7: return 0xfa;
-      case 0x221a: return 0xfb;
-      case 0x2116: return 0xfc;
-      case 0xa4: return 0xfd;
-      case 0x25a0: return 0xfe;
-      case 0xa0: return 0xff;
-      default: return 0; // unknown
-    }
-  }
-}
-
 static void poll_events (void) {
   int key, down, uch, ch;
   SDL_Event ev;