OVR: Make Benson (control panel) closer to oberver

[mercenary-reloaded.git] / src / mercenary / main.c

diff --git a/src/mercenary/main.c b/src/mercenary/main.c
index f0b464b..0ce1a68 100644 (file)
--- a/src/mercenary/main.c
+++ b/src/mercenary/main.c
@@ -65,7 +65,7 @@ static int config_render = 1; /* opengl render */
 static int config_skip_intro = 0;
 static int config_multisampling = 8;
 #ifdef HAVE_OVR
-static double config_benson_size = 0.5;
+static double config_benson_size = 0.7;
 static double config_fov = FOV_JOLLY;
 #else
 static double config_benson_size = 1.0;
@@ -73,7 +73,7 @@ static double config_fov = FOV_NOVAGEN;
 #endif
 static double config_monitor_distance = 41.5; /* inch */
 #ifdef HAVE_OVR
-static double config_keyboard_distance = 40.5; /* inch */
+static double config_keyboard_distance = 38.5; /* inch */
 static double config_keyboard_height = -26.0; /* inch */
 #endif
 static int config_debug_transparent = 0;
@@ -1060,7 +1060,7 @@ fail:
        }
 }
 
-static int shift = 0, ctrl = 0;
+static int shift = 0, ctrl = 0, alt = 0;
 
 static void keyboard_sdl(int down, enum keycode keycode)
 {
@@ -1198,6 +1198,14 @@ static void keyboard_sdl(int down, enum keycode keycode)
                set_amiga_key(keycode, down);
                shift = down;
                break;
+       case KEYCODE_LALT:
+               set_amiga_key(keycode, down);
+               alt = down;
+               break;
+       case KEYCODE_RALT:
+               set_amiga_key(keycode, down);
+               alt = down;
+               break;
        case KEYCODE_LEFT:
                if (shift && down) {
                        set_amiga_key(keycode, down);
@@ -1223,7 +1231,8 @@ static void keyboard_sdl(int down, enum keycode keycode)
                        break;
                }
                set_amiga_key(keycode, 0);
-               set_joystick(-1, -1, down, -1, -1);
+               if (!alt || down)
+                       set_joystick(-1, -1, down, 0, -1);
                break;
        case KEYCODE_DOWN:
                if (shift && down) {
@@ -1232,7 +1241,8 @@ static void keyboard_sdl(int down, enum keycode keycode)
                        break;
                }
                set_amiga_key(keycode, 0);
-               set_joystick(-1, -1, -1, down, -1);
+               if (!alt || down)
+                       set_joystick(-1, -1, 0, down, -1);
                break;
        case KEYCODE_END:
                set_joystick(-1, -1, -1, -1, down);