X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=mercenary-reloaded.git;a=blobdiff_plain;f=src%2Fmercenary%2Fmain.c;h=45d87e4bca4637f5df95041260555dcbe51d4981;hp=82296422c56a0d4ef0e9bda38b4513604aa27b5e;hb=3c70467233fef462f9bc9a132019800386978cc8;hpb=9d09795a51c4e55c61d1d1ceb50544e21a82a794 diff --git a/src/mercenary/main.c b/src/mercenary/main.c index 8229642..45d87e4 100644 --- a/src/mercenary/main.c +++ b/src/mercenary/main.c @@ -114,13 +114,8 @@ static uint8_t *info_osd = NULL; static int help_view = 1; static int help_views = 0; static int32_t osd_timer = 0, border_timer = 0; -#ifdef HAVE_OVR -#define SCREEN_WIDTH 1344 -#define SCREEN_HEIGHT 800 -#else #define SCREEN_WIDTH (320*3) #define SCREEN_HEIGHT (200*3) -#endif #define IMAGE_WIDTH 320 #define IMAGE_HEIGHT 200 #define BENSON_AT_LINE 136 @@ -770,6 +765,9 @@ static void main_loop(void) /* render result on window */ while (!quit) { #ifdef HAVE_OVR + /* quit by OVR server */ + if (should_quit_ovr()) + break; /* get vr poses */ handle_vr_poses(); #endif