diff --git a/menu/menu_driver.c b/menu/menu_driver.c index b14ab7b09f..bcabff372e 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -509,9 +509,9 @@ void menu_display_scissor_begin(video_frame_info_t *video_info, int x, int y, un y = 0; if (x < 0) x = 0; - if (y >= menu_display_framebuf_height) + if (y >= (int)menu_display_framebuf_height) return; - if (x >= menu_display_framebuf_width) + if (x >= (int)menu_display_framebuf_width) return; if ((y + height) > menu_display_framebuf_height) height = menu_display_framebuf_height - y; diff --git a/pkg/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj b/pkg/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj index 0da7a53238..7713a34ffc 100644 --- a/pkg/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj +++ b/pkg/msvc/RetroArch-Xbox1/RetroArch-Xbox1.vcproj @@ -1,462 +1,462 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj index 4a69701f89..6d1faf86cc 100644 --- a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj +++ b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj @@ -20,7 +20,7 @@ bools.menu_pause_libretro) { runloop_netplay_pause(); } +#endif goto end; case RUNLOOP_STATE_MENU_ITERATE: - runloop_netplay_pause(); +#ifdef HAVE_NETWORKING + runloop_netplay_pause(); return 0; +#endif case RUNLOOP_STATE_ITERATE: break; }