X-Git-Url: https://deadsoftware.ru/gitweb?p=flatwaifu.git;a=blobdiff_plain;f=src%2Fsdl%2Fmain.c;h=057c82ec2123842550a3ab41bf69df1e14b86aed;hp=9227725c9876a90f48dd1c9380ab3695acda90ae;hb=4a99fe51561ca331df54512eb25c502d0fcd2b55;hpb=4a0a2f1f4922d5346c4aee584e7d4a13803bffab

diff --git a/src/sdl/main.c b/src/sdl/main.c
index 9227725..057c82e 100644
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
@@ -28,8 +28,6 @@
 #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"
@@ -38,9 +36,11 @@
 #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
@@ -58,6 +58,60 @@ static int mode = MODE_NONE;
 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},
+//  {"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, ...) {
@@ -84,8 +138,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КРИТИЧЕСКАЯ ОШИБКА:");
@@ -425,7 +479,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;
@@ -480,7 +534,7 @@ int main (int argc, char *argv[]) {
   M_startup();
   F_allocres();
   S_init();
-  S_initmusic();
+  MUS_init();
   R_init();
   G_init();
   ticks = SDL_GetTicks();
@@ -493,7 +547,7 @@ int main (int argc, char *argv[]) {
 #endif
   CFG_save();
   R_done();
-  S_donemusic();
+  MUS_done();
   S_done();
   M_shutdown();
   SDL_Quit();