On menu screens, read Unicode key value instead of keynumber (Peter de Wachter).

Author: Hugh Robinson

asylum.c

@@ -480,6 +480,7 @@ int main(int argc, char** argv)
 
     SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO);
     SDL_WM_SetCaption("Asylum", "Asylum");
+    SDL_EnableUNICODE(1);
 #ifndef _NO_SOUND
     init_audio();
 #endif

asylum.h

@@ -495,6 +495,7 @@ void swi_stasis_control(int a, int b);
 void swi_stasis_volslide(int a, int b, int c);
 void swi_removecursors();
 int osbyte_79(int c);
+int osbyte_79_unicode(int c);
 int osbyte_7a();
 void osbyte_7c();
 int osbyte_81(int c);

keyboard.c

@@ -19,9 +19,10 @@
 
 extern asylum_options options;
 
-char keyboard[512];
-int keybuf;
-int mouse;
+static char keyboard[512];
+static int keybuf;
+static int unibuf;
+static int mouse;
 
 #define ESC_VALUE 27
 
@@ -54,6 +55,14 @@ int osbyte_79(int c)
     return -1;
 }
 
+int osbyte_79_unicode(int c)
+{
+    update_keyboard();
+    int uni = unibuf;
+    unibuf = -1;
+    return uni;
+}
+
 int osbyte_7a()
 {
     update_keyboard(); for (int i = 0; i < 512; i++) if (keyboard[i]) return i;return -1;
@@ -96,6 +105,10 @@ void update_keyboard()
             ke = (SDL_KeyboardEvent*)&e;
             keyboard[ke->keysym.sym] = 0xff;
             keybuf = ke->keysym.sym;
+            if (ke->keysym.unicode)
+                unibuf = ke->keysym.unicode;
+            else
+                unibuf = -1;
             break;
         case SDL_KEYUP:
             ke = (SDL_KeyboardEvent*)&e;
@@ -128,7 +141,7 @@ void update_keyboard()
 
 void zonecheatread(int* zone)
 {
-    char r1 = osbyte_7a(); // was _81(0)
+    char r1 = osbyte_79_unicode(0); // was _81(0)
 
     if ((r1 < 48) || (r1 > 56)) return;
     *zone = r1-48;

menus.c

@@ -54,18 +54,17 @@ int escapehandler()
             swi_fastspr_clearwindow();
             texthandler();
         }
-       esctextstop:
-        if (osbyte_81(-113))
+        switch (osbyte_79_unicode(1))
         {
-            loselife(); return 0;
-        }
-        if (osbyte_81(-111))
-        {
-            adjustopt(); return 0;
-        }
-        if (osbyte_81(-114))
-        {
-            rejoin(); return 0;
+            case 'q': case 'Q':
+                loselife();
+                return 0;
+            case 'o': case 'O':
+                adjustopt();
+                return 0;
+            case 'r': case 'R':
+                rejoin();
+                return 0;
         }
     }
     osbyte_7c();
@@ -478,7 +477,7 @@ int readopt(int maxopt)
 {
     int r1;
 
-    do
+    for (;;)
     {
        keyloop:
         if (options.joyno != 0)
@@ -488,27 +487,18 @@ int readopt(int maxopt)
 //if (r0&(1<<16)) {/*optfire:*/ return 0;}
         }
        nooptstick:
-        r1 = osbyte_81(1); // read key in time limit
-// if (r1!=0xff) printf("%i\n",r1);
+        r1 = osbyte_79_unicode(1); // read key in time limit
         if (swi_readescapestate())
         {
            optescape:
             osbyte_7c(); // clear escape
             return -1;
         }
-        if (r1 == 0) continue;
+        if (r1 >= '0' && r1 <= '0' + maxopt)
+            return r1 - '0';
         if (osbyte_81(options.firekey) == 0xff)
             return 0;
-        if (r1 >= SDLK_0 && r1 <= SDLK_9)
-            r1 -= SDLK_0;
-        else if (r1 >= SDLK_KP0 && r1 <= SDLK_KP9)
-            r1 -= SDLK_KP0;
-        else
-            continue;
     }
-    while (!((r1 >= 0) && (r1 <= maxopt)));
-   optexit:
-    return r1;
 }
 
 const int _x = 250;
@@ -559,8 +549,8 @@ int prelude()
         if (readmousestate()&2)
         {
            gocheat:
-            if (osbyte_81(-307) != 0xff) return cheatpermit;
-            if (osbyte_81(-308) != 0xff) return cheatpermit;
+            if (osbyte_81(-SDLK_LALT) != 0xff) return cheatpermit;
+            if (osbyte_81(-SDLK_RALT) != 0xff && osbyte_81(-SDLK_MODE) != 0xff) return cheatpermit;
             cheatpermit = 1;
             scroll = 1024;
         }