X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fmenu.c;h=7f44950493624f25d6ab8ccd6b67e21009d718e6;hb=647924a407f11655babc5450f098ee504fe1d182;hp=7d5f374ddff2e0c791c5c5327973ee9f6c997795;hpb=d070670f189ec66ed2ac6b45834a192c004bc92f;p=flatwaifu.git

diff --git a/src/menu.c b/src/menu.c
index 7d5f374..7f44950 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -27,7 +27,6 @@
 #include "files.h"
 #include "memory.h"
 #include "error.h"
-#include "keyb.h"
 #include "sound.h"
 #include "view.h"
 #include "player.h"
@@ -35,31 +34,28 @@
 #include "menu.h"
 #include "misc.h"
 #include "render.h"
+#include "config.h"
+#include "game.h"
+#include "player.h"
+#include "sound.h"
+#include "music.h"
+#include "input.h"
 
-#include <SDL.h>
 #include <sys/stat.h>
-extern SDL_Surface *screen;
 
 #define QSND_NUM 14
 
 enum{HIT100,ARMOR,JUMP,WPNS,IMMORTAL,SPEED,OPEN,EXIT};
 
-extern int PL_JUMP,PL_RUN;
-extern byte _warp,cheat,p_fly;
-
-extern char g_music[8];
+static byte panim[] = "BBDDAACCDDAABBDDAACCDDAABBDDAACCDDAAEEEEEFEFEFEFEFEFEFEFEFEFEEEEE";
+byte *panimp = panim;
+byte _warp;
 
-extern byte savname[7][24],savok[7];
-void load_game(int);
-
-static byte panim[]=
-  "BBDDAACCDDAABBDDAACCDDAABBDDAACCDDAAEEEEEFEFEFEFEFEFEFEFEFEFEEEEE";
-byte *panimp=panim;
-
-byte pcolortab[PCOLORN]={
-  0x18,0x20,0x40,0x58,0x60,0x70,0x80,0xB0,0xC0,0xD0
+byte pcolortab[PCOLORN] = {
+  0x18, 0x20, 0x40, 0x58, 0x60, 0x70, 0x80, 0xB0, 0xC0, 0xD0
 };
-int p1color=5,p2color=4;
+int p1color = 5;
+int p2color = 4;
 
 char ibuf[24];
 byte input=0;
@@ -152,35 +148,40 @@ static void *csnd1,*csnd2,*msnd1,*msnd2,*msnd3,*msnd4,*msnd5,*msnd6;
 static int movsndt=0;
 static byte cbuf[32];
 
-static snd_t *voc=NULL;
-static int voc_ch=0;
+static snd_t *voc;
+static int voc_ch;
 
-extern byte shot_vga; // config.c
+static void GMV_stop (void) {
+  if (voc != NULL) {
+    if (voc_ch) {
+      S_stop(voc_ch);
+      voc_ch = 0;
+    }
+    S_free(voc);
+    voc = NULL;
+  }
+}
 
-void GMV_stop(void) {
-  if(voc) {
-    if(voc_ch) {S_stop(voc_ch);voc_ch=0;}
-    free(voc);voc=NULL;
+void GMV_say (const char nm[8]) {
+  snd_t *snd = S_load(nm);
+  if (snd) {
+    GMV_stop();
+    voc = S_load(nm);
+    voc_ch = S_play(voc, 0, 255);
   }
 }
 
-void GMV_say(char *nm) {
-  int r,len;
-  snd_t *p;
-  byte *d;
-
-  if((r=F_findres(nm))==-1) return;
-  if(!(p=malloc((len=F_getreslen(r))+16))) return;
-  p->len=len;p->rate=11000;
-  p->lstart=p->llen=0;
-  GMV_stop();
-  F_loadres(r,p+1,0,len);
-  for(d=(byte*)(p+1);len;--len,++d) *d^=128;
-  voc=p;
-  voc_ch=S_play(voc,-1,1024,255);
+static void GM_set (menu_t *m) {
+  mnu=m;gm_redraw=1;
+  if(g_st==GS_GAME) {
+	//V_setrect(0,SCRW,0,SCRH);V_clr(0,SCRW,0,SCRH,0);//V_setrect(0,320,0,200);V_clr(0,320,0,200,0);
+	//if(_2pl) {V_setrect(SCRW-120,120,0,SCRH);w_o=0;Z_clrst();w_o=SCRH/2;Z_clrst();}//if(_2pl) {V_setrect(200,120,0,200);w_o=0;Z_clrst();w_o=100;Z_clrst();}
+	//else {V_setrect(SCRW-120,120,0,SCRH);w_o=0;Z_clrst();}//else {V_setrect(200,120,50,100);w_o=50;Z_clrst();}
+	//pl1.drawst=pl2.drawst=0xFF;V_setrect(0,SCRW,0,SCRH);//V_setrect(0,320,0,200);
+  }
 }
 
-void G_code(void) {
+void G_code (void) {
   void *s;
   s=csnd2;
   if(memcmp(cbuf+32-5,"IDDQD",5)==0) {
@@ -222,19 +223,7 @@ void G_code(void) {
   Z_sound(s,128);
 }
 
-void GM_set(menu_t *m) {
-  mnu=m;gm_redraw=1;
-  if(g_st==GS_GAME) {
-	//V_setrect(0,SCRW,0,SCRH);V_clr(0,SCRW,0,SCRH,0);//V_setrect(0,320,0,200);V_clr(0,320,0,200,0);
-	//if(_2pl) {V_setrect(SCRW-120,120,0,SCRH);w_o=0;Z_clrst();w_o=SCRH/2;Z_clrst();}//if(_2pl) {V_setrect(200,120,0,200);w_o=0;Z_clrst();w_o=100;Z_clrst();}
-	//else {V_setrect(SCRW-120,120,0,SCRH);w_o=0;Z_clrst();}//else {V_setrect(200,120,50,100);w_o=50;Z_clrst();}
-	//pl1.drawst=pl2.drawst=0xFF;V_setrect(0,SCRW,0,SCRH);//V_setrect(0,320,0,200);
-  }
-}
-
-void setgamma(int);
-
-void GM_command(int c) {
+static void GM_command (int c) {
   switch(c) {
     case CANCEL:
       GM_set(NULL);break;
@@ -307,8 +296,8 @@ void GM_command(int c) {
 	  F_freemus();
 	  GMV_stop();
 #ifndef DEMO
-	  c=Z_sound(M_lock(qsnd[myrand(QSND_NUM)]),256);//for(c=(Z_sound(M_lock(qsnd[random2(QSND_NUM)]),256)+9)<<16,timer=0;timer<c;);
-          S_wait();
+	  c = Z_sound(S_get(qsnd[myrand(QSND_NUM)]), 255);
+    S_wait();
 #endif
 	  ERR_quit();break;
     case ENDGM:
@@ -339,76 +328,53 @@ void GM_command(int c) {
   }
 }
 
-/*
-byte keychar[2][128]={{
-  0,0,'1','2','3','4','5','6','7','8','9','0','-','=',0,0,
-  'Q','W','E','R','T','Y','U','I','O','P','[',']','\r',0,'A','S',
-  'D','F','G','H','J','K','L',';','\'',0,0,'\\','Z','X','C','V',
-  'B','N','M',',','.','/',0,'*',0,' ',0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,'-',0,0,0,'+',0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-},{
-  0,0,'!','\"','#','$','%',':','&','*','(',')','_','+',0,0,
-  'x','x','x','x','x','x','x','x','x','x','x','x','\r',0,'x','x',
-  'x','x','x','x','x','x','x','x','x',0,0,0,'x','x','x','x',
-  'x','x','x','x','x','?',0,'*',0,' ',0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,'-',0,0,0,'+',0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-}};
-*/
-
 struct {
     int keysym;
     byte ch;
 } keychar[] = {
-    {SDLK_SPACE, ' '},
-    {SDLK_0, '0'},
-    {SDLK_1, '1'},
-    {SDLK_2, '2'},
-    {SDLK_3, '3'},
-    {SDLK_4, '4'},
-    {SDLK_5, '5'},
-    {SDLK_6, '6'},
-    {SDLK_7, '7'},
-    {SDLK_8, '8'},
-    {SDLK_9, '9'},
-    {SDLK_UNDERSCORE, '_'},
-    {SDLK_a, 'A'},
-    {SDLK_b, 'B'},
-    {SDLK_c, 'C'},
-    {SDLK_d, 'D'},
-    {SDLK_e, 'E'},
-    {SDLK_f, 'F'},
-    {SDLK_g, 'G'},
-    {SDLK_h, 'H'},
-    {SDLK_i, 'I'},
-    {SDLK_j, 'J'},
-    {SDLK_k, 'K'},
-    {SDLK_l, 'L'},
-    {SDLK_m, 'M'},
-    {SDLK_n, 'N'},
-    {SDLK_o, 'O'},
-    {SDLK_p, 'P'},
-    {SDLK_q, 'Q'},
-    {SDLK_r, 'R'},
-    {SDLK_s, 'S'},
-    {SDLK_t, 'T'},
-    {SDLK_u, 'U'},
-    {SDLK_v, 'V'},
-    {SDLK_w, 'W'},
-    {SDLK_x, 'X'},
-    {SDLK_y, 'Y'},
-    {SDLK_z, 'Z'},
-    {SDLK_COMMA,','},
+    {KEY_SPACE, ' '},
+    {KEY_0, '0'},
+    {KEY_1, '1'},
+    {KEY_2, '2'},
+    {KEY_3, '3'},
+    {KEY_4, '4'},
+    {KEY_5, '5'},
+    {KEY_6, '6'},
+    {KEY_7, '7'},
+    {KEY_8, '8'},
+    {KEY_9, '9'},
+    //{KEY_UNDERSCORE, '_'},
+    {KEY_A, 'A'},
+    {KEY_B, 'B'},
+    {KEY_C, 'C'},
+    {KEY_D, 'D'},
+    {KEY_E, 'E'},
+    {KEY_F, 'F'},
+    {KEY_G, 'G'},
+    {KEY_H, 'H'},
+    {KEY_I, 'I'},
+    {KEY_J, 'J'},
+    {KEY_K, 'K'},
+    {KEY_L, 'L'},
+    {KEY_M, 'M'},
+    {KEY_N, 'N'},
+    {KEY_O, 'O'},
+    {KEY_P, 'P'},
+    {KEY_Q, 'Q'},
+    {KEY_R, 'R'},
+    {KEY_S, 'S'},
+    {KEY_T, 'T'},
+    {KEY_U, 'U'},
+    {KEY_V, 'V'},
+    {KEY_W, 'W'},
+    {KEY_X, 'X'},
+    {KEY_Y, 'Y'},
+    {KEY_Z, 'Z'},
+    {KEY_COMMA,','},
     {0}
 };
 
-byte get_keychar(int keysym)
-{
+static byte get_keychar (int keysym) {
     int i = 0;
     while (keychar[i].keysym) {
         if (keychar[i].keysym == keysym) return keychar[i].ch;
@@ -417,7 +383,8 @@ byte get_keychar(int keysym)
     return 0;
 }
 
-static void shot(void) {
+static void shot (void) {
+/*
   static int num=1;
   char fn[100];//...
 #ifndef WIN32
@@ -431,9 +398,10 @@ static void shot(void) {
 #endif
   SDL_SaveBMP(screen, fn);
   ++num;
+*/
 }
 
-int GM_act(void) {
+int GM_act (void) {
   byte c;
 
   if(mnu==&plcolor_mnu) {
@@ -446,111 +414,169 @@ int GM_act(void) {
     lastkey=0;
     return 1;
   }
-  if(input) switch(lastkey) {
-    case SDLK_RETURN: case SDLK_KP_ENTER://case 0x1C: case 0x9C:
-      F_savegame(save_mnu.cur,ibuf);
-      input=0;GM_set(NULL);break;
-    case 1: input=0;GM_set(mnu);break;
-    case SDLK_BACKSPACE://case 0x0E:
-        if(icur) {ibuf[--icur]=0;GM_set(mnu);} break;
-    default:
-      if(icur>=23) break;
-      c=get_keychar(lastkey);//c=keychar[(keys[0x2A] || keys[0x36])?1:0][lastkey];
-      if(!c) break;
-      ibuf[icur]=c;ibuf[++icur]=0;GM_set(mnu);
-  }else {
-      switch(lastkey) {
-    case SDLK_ESCAPE://case 1:
-      if(!mnu) {GM_set(&main_mnu);Z_sound(msnd3,128);}
-      else {GM_set(NULL);Z_sound(msnd4,128);}
-      break;
-    case SDLK_F5:
-      if(mnu) break;
-      Z_sound(msnd3,128);
-      GMV_say("_GAMMA");
-      GM_set(&gamma_mnu);break;
-    case SDLK_F4://case 0x3E:
-      if(mnu) break;
-      Z_sound(msnd3,128);
-      GMV_say("_VOLUME");
-      GM_set(&vol_mnu);break;
-    case SDLK_F2://case 0x3C:
-      if(mnu) break;
-      if(g_st!=GS_GAME) break;
-      Z_sound(msnd3,128);
-      F_getsavnames();GM_set(&save_mnu);break;
-    case SDLK_F3://case 0x3D:
-      if(mnu) break;
-      Z_sound(msnd3,128);
-      F_getsavnames();GM_set(&load_mnu);break;
-    case SDLK_F10://case 0x44:
-      if(mnu) break;
-      Z_sound(msnd3,128);
-      GM_command(QUITGAME);break;
-    case SDLK_UP: case SDLK_KP8://case 0x48: case 0xC8:
-      if(!mnu) break;
-      if(mnu->type!=MENU) break;
-      if(--mnu->cur<0) mnu->cur=mnu->n-1;
-      GM_set(mnu);
-      Z_sound(msnd1,128);break;
-    case SDLK_DOWN: case SDLK_KP5: case SDLK_KP2://case 0x50: case 0xD0: case 0x4C:
-      if(!mnu) break;
-      if(mnu->type!=MENU) break;
-      if(++mnu->cur>=mnu->n) mnu->cur=0;
-      GM_set(mnu);
-      Z_sound(msnd1,128);break;
-    case SDLK_LEFT: case SDLK_RIGHT: case SDLK_KP4: case SDLK_KP6://case 0x4B: case 0x4D: case 0xCB: case 0xCD:
-	  if(!mnu) break;
-	  if(mnu->type!=MENU) break;
-	  if(mnu->t[mnu->cur]<SVOLM) break;
-	  GM_command(mnu->t[mnu->cur]+((lastkey==SDLK_LEFT || lastkey==SDLK_KP4)?0:1));//GM_command(mnu->t[mnu->cur]+((lastkey==0x4B || lastkey==0xCB)?0:1));
-	  GM_set(mnu);
-	  if(!movsndt) movsndt=Z_sound((lastkey==SDLK_LEFT || lastkey==SDLK_KP4)?msnd5:msnd6,255);//if(!movsndt) movsndt=Z_sound((lastkey==0x4B || lastkey==0xCB)?msnd5:msnd6,255);
-	  break;
-    case SDLK_RETURN: case SDLK_SPACE: case SDLK_KP_ENTER://case 0x1C: case 0x39: case 0x9C:
-	  if(!mnu) break;
-	  if(mnu->type!=MENU) break;
-	  if(mnu->t[mnu->cur]>=PL1CM) {
-	    Z_sound(msnd2,128);
-	    GM_command(PLCEND);
-	    break;
-	  }
-	  if(mnu->t[mnu->cur]>=SVOLM) break;
-	  Z_sound(msnd2,128);
-	  GM_command(mnu->t[mnu->cur]);
-      break;
-    case SDLK_y://case 0x15:
-      if(!mnu) break;
-      if(mnu->type!=MSG) break;
-      Z_sound(msnd3,128);
-      GM_command(mnu->t[0]);
-      break;
-    case SDLK_n://case 0x31:
-      if(!mnu) break;
-      if(mnu->type!=MSG) break;
-      Z_sound(msnd4,128);
-      GM_command(mnu->t[1]);
-      break;
-    case SDLK_F1://case 0x3B:
-      if(shot_vga) {shot();Z_sound(msnd4,128);}
-      break;
-  }
+  if (input) {
+    switch (lastkey) {
+      case KEY_RETURN:
+      case KEY_KP_ENTER:
+        F_savegame(save_mnu.cur, ibuf);
+        input = 0;
+        GM_set(NULL);
+        break;
+      case KEY_ESCAPE:
+        input = 0;
+        GM_set(mnu);
+        break;
+      case KEY_BACKSPACE:
+        if (icur) {
+          icur -= 1;
+          ibuf[icur] = 0;
+          GM_set(mnu);
+        }
+        break;
+      default:
+        if (icur < 23) {
+          c = get_keychar(lastkey);
+          if (c != 0) {
+            ibuf[icur] = c;
+            icur += 1;
+            ibuf[icur] = 0;
+            GM_set(mnu);
+          }
+        }
+        break;
+    }
+  } else {
+    switch (lastkey) {
+      case KEY_ESCAPE:
+        if (mnu == NULL) {
+          GM_set(&main_mnu);
+          Z_sound(msnd3, 128);
+        } else {
+          GM_set(NULL);
+          Z_sound(msnd4, 128);
+        }
+        break;
+      case KEY_F5:
+        if (mnu == NULL) {
+          Z_sound(msnd3, 128);
+          GMV_say("_GAMMA");
+          GM_set(&gamma_mnu);
+        }
+        break;
+      case KEY_F4:
+        if (mnu == NULL) {
+          Z_sound(msnd3, 128);
+          GMV_say("_VOLUME");
+          GM_set(&vol_mnu);
+        }
+        break;
+      case KEY_F2:
+        if (mnu == NULL && g_st == GS_GAME) {
+          Z_sound(msnd3, 128);
+          F_getsavnames();
+          GM_set(&save_mnu);
+        }
+        break;
+      case KEY_F3:
+        if (mnu == NULL) {
+          Z_sound(msnd3, 128);
+          F_getsavnames();
+          GM_set(&load_mnu);
+        }
+        break;
+      case KEY_F10:
+        if (mnu == NULL) {
+          Z_sound(msnd3, 128);
+          GM_command(QUITGAME);
+        }
+        break;
+      case KEY_UP:
+      case KEY_KP_8:
+        if (mnu != NULL && mnu->type == MENU) {
+          mnu->cur -= 1;
+          if (mnu->cur < 0) {
+            mnu->cur = mnu->n - 1;
+          }
+          GM_set(mnu);
+          Z_sound(msnd1, 128);
+        }
+        break;
+      case KEY_DOWN:
+      case KEY_KP_5:
+      case KEY_KP_2:
+        if (mnu != NULL && mnu->type == MENU) {
+          mnu->cur += 1;
+          if (mnu->cur >= mnu->n) {
+            mnu->cur = 0;
+          }
+          GM_set(mnu);
+          Z_sound(msnd1, 128);
+        }
+        break;
+      case KEY_LEFT:
+      case KEY_RIGHT:
+      case KEY_KP_4:
+      case KEY_KP_6:
+        if (mnu != NULL && mnu->type == MENU && mnu->t[mnu->cur] >= SVOLM) {
+          GM_command(mnu->t[mnu->cur] + (lastkey == KEY_LEFT || lastkey == KEY_KP_4));
+          GM_set(mnu);
+          if (!movsndt) {
+            movsndt = Z_sound(lastkey == KEY_LEFT || lastkey == KEY_KP_4 ? msnd5 : msnd6, 255);
+          }
+        }
+        break;
+      case KEY_RETURN:
+      case KEY_SPACE:
+      case KEY_KP_ENTER:
+        if (mnu != NULL && mnu->type == MENU) {
+          if (mnu->t[mnu->cur] >= PL1CM) {
+            Z_sound(msnd2, 128);
+            GM_command(PLCEND);
+            break;
+          } else if (mnu->t[mnu->cur] < SVOLM) {
+            Z_sound(msnd2,128);
+            GM_command(mnu->t[mnu->cur]);
+          }
+        }
+        break;
+      case KEY_Y:
+        if (mnu != NULL && mnu->type == MSG) {
+          Z_sound(msnd3, 128);
+          GM_command(mnu->t[0]);
+        }
+        break;
+      case KEY_N:
+        if (mnu != NULL && mnu->type == MSG) {
+          Z_sound(msnd4, 128);
+          GM_command(mnu->t[1]);
+        }
+        break;
+      case KEY_F1:
+        if (shot_vga) {
+          shot();
+          Z_sound(msnd4, 128);
+        }
+        break;
+    }
   }
-  lastkey=0;
-  return((mnu)?1:0);
+  lastkey = KEY_UNKNOWN;
+  return mnu ? 1 : 0;
 }
 
-void G_keyf(int k, int press) {
+void G_keyf (int key, int down) {
   int i;
-
-  lastkey=k;
-  if(!_2pl || cheat) {
-    for(i=0;i<31;++i) cbuf[i]=cbuf[i+1];
-    cbuf[31]=get_keychar(k);
+  if (down) {
+    lastkey = key;
+    if (!_2pl || cheat) {
+      for (i = 0; i < 31; ++i) {
+        cbuf[i] = cbuf[i + 1];
+      }
+      cbuf[31] = get_keychar(key);
+    }
   }
 }
 
-void GM_init(void) {
+void GM_init (void) {
 #ifndef DEMO
   int i;
   static char nm[QSND_NUM][6]={
@@ -573,5 +599,6 @@ void GM_init(void) {
   msnd4=Z_getsnd("SWTCHX");
   msnd5=Z_getsnd("SUDI");
   msnd6=Z_getsnd("TUDI");
-  K_setkeyproc(G_keyf);
+  F_loadmus("MENU");
+  S_startmusic(0);
 }