X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fsdl%2Fmain.c;h=1c16dc33307100048c40af58c3a38ee2060b7319;hb=9f3ca6bf02300e3dc72e3c2085a8e35aa9242678;hp=b3627fc2f92ef66cb54a83e39e228d16380aaac9;hpb=b047ed3a09b3738defa4f0c323dbe698ff6831ce;p=flatwaifu.git

diff --git a/src/sdl/main.c b/src/sdl/main.c
index b3627fc..1c16dc3 100644
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h> // srand exit
-#include <string.h> // strcasecmp
 #include <assert.h>
 #include "system.h"
 #include "input.h"
@@ -37,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
@@ -54,6 +55,64 @@ static Uint32 ticks;
 static int quit = 0;
 static SDL_Surface *surf = NULL;
 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},
+  {"sndvol", &snd_vol, Y_WORD},
+  {"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},
+  {"sound_volume", &snd_vol, Y_WORD},
+  {"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() };
+  ARG_parse(argc, argv, 2, list);
+}
+
+static void CFG_load (void) {
+  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, R_conf() };
+  CFG_update_config("doom2d.cfg", "doom2d.cfg", 2, list, "generated by doom2d, do not modify");
+}
 
 /* --- error.h --- */
 
@@ -149,6 +208,47 @@ int Y_set_videomode_software (int w, int h, int fullscreen) {
   return s != NULL;
 }
 
+static void init_videomode_list (Uint32 flags) {
+  int i, n;
+  SDL_Rect **r;
+  if (vlist.modes != NULL) {
+    free(vlist.modes);
+    vlist.modes = NULL;
+    vlist.n = 0;
+  }
+  r = SDL_ListModes(NULL, flags);
+  if (r == (SDL_Rect **)-1) {
+    if ((flags & SDL_FULLSCREEN) == 0) {
+      init_videomode_list(flags | SDL_FULLSCREEN);
+    }
+  } else if (r != (SDL_Rect**)0) {
+    n = 0;
+    while (r[n] != NULL) {
+      n++;
+    }
+    vlist.modes = malloc(n * sizeof(videomode_size_t));
+    if (vlist.modes != NULL) {
+      vlist.n = n;
+      for (i = 0; i < n; i++) {
+        vlist.modes[i] = (videomode_size_t) {
+          .w = r[i]->w,
+          .h = r[i]->h
+        };
+      }
+    }
+  }
+}
+
+const videomode_t *Y_get_videomode_list_opengl (int fullscreen) {
+  init_videomode_list(SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0));
+  return &vlist;
+}
+
+const videomode_t *Y_get_videomode_list_software (int fullscreen) {
+  init_videomode_list(SDL_SWSURFACE | SDL_HWPALETTE | (fullscreen ? SDL_FULLSCREEN : 0));
+  return &vlist;
+}
+
 void Y_get_videomode (int *w, int *h) {
   if (mode != MODE_NONE) {
     *w = surf->w;
@@ -232,6 +332,14 @@ void Y_repaint (void) {
   SDL_Flip(surf);
 }
 
+void Y_enable_text_input (void) {
+  text_input = 1;
+}
+
+void Y_disable_text_input (void) {
+  text_input = 0;
+}
+
 /* --- main --- */
 
 static int sdl_to_key (int code) {
@@ -344,8 +452,8 @@ static int sdl_to_key (int code) {
   }
 }
 
-static void poll_events (void (*h)(int key, int down)) {
-  int key;
+static void poll_events (void) {
+  int key, sym, down;
   SDL_Event ev;
   while (SDL_PollEvent(&ev)) {
     switch (ev.type) {
@@ -357,10 +465,14 @@ static void poll_events (void (*h)(int key, int down)) {
         break;
       case SDL_KEYDOWN:
       case SDL_KEYUP:
-        key = sdl_to_key(ev.key.keysym.sym);
-        I_press(key, ev.type == SDL_KEYDOWN);
-        if (h != NULL) {
-          (*h)(key, ev.type == SDL_KEYDOWN);
+        sym = ev.key.keysym.sym;
+        down = ev.type == SDL_KEYDOWN;
+        key = sdl_to_key(sym);
+        I_press(key, down);
+        GM_key(key, down);
+        if (down && text_input && sym >= 0x20 && sym <= 0x7e) {
+          // TODO fix this
+          GM_input(sym);
         }
         break;
     }
@@ -368,7 +480,7 @@ static void poll_events (void (*h)(int key, int down)) {
 }
 
 static void step (void) {
-  poll_events(&G_keyf);
+  poll_events();
   S_updatemusic();
   Uint32 t = SDL_GetTicks();
   if (t - ticks > DELAY) {
@@ -385,7 +497,7 @@ int main (int argc, char *argv[]) {
     logo("main: failed to init SDL: %s\n", SDL_GetError());
     return 1;
   }
-  SDL_WM_SetCaption("Doom 2D v1.351", "Doom 2D");
+  SDL_WM_SetCaption("Doom 2D (SDL)", "Doom 2D");
   // Player 1 defaults
   pl1.ku = KEY_KP_8;
   pl1.kd = KEY_KP_5;