From e43d0f5edbee93e4049c44b6961d9f1a8aecf048 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 24 Oct 2015 04:15:58 +0200 Subject: [PATCH] (Zarch) Remove unused variable --- menu/drivers/zarch.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 5959daf74a..61a97cc424 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -201,13 +201,12 @@ static float zui_strwidth(void *fb_buf, const char *text, float scale) static void zui_begin(void) { - const struct retro_keybind *binds[MAX_USERS]; zui_t *zui = NULL; driver_t *driver = (driver_t*)driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr(); - gl_t *gl = NULL; + gl_t *gl = (gl_t*)video_driver_get_ptr(NULL); - if (!menu) + if (!gl || !menu) return; zui = (zui_t*)menu->userdata; @@ -215,23 +214,15 @@ static void zui_begin(void) if (!zui || !driver) return; - gl = (gl_t*)video_driver_get_ptr(NULL); - - if (!gl) - return; - zui->rendering = true; - - zui->hash = 0; - zui->item.hot = 0; + zui->hash = 0; + zui->item.hot = 0; glViewport(0, 0, zui->width, zui->height); - if (gl && gl->shader && gl->shader->set_mvp) gl->shader->set_mvp(gl, &zui->mvp); - /* why do i need this? */ zui->mouse.wheel = menu_input_mouse_state(MENU_MOUSE_WHEEL_DOWN) - menu_input_mouse_state(MENU_MOUSE_WHEEL_UP); @@ -858,6 +849,7 @@ static void zui_render(void) { unsigned i, j = 0; zui->pick_first += zui->mouse.wheel; + zui->pick_first = min(max(zui->pick_first, 0), zui->pick_supported - 5); for (i = zui->pick_first; i < zui->pick_supported; ++i)