# HG changeset patch # User ib # Date 1359161605 0 # Node ID 8e5a3da0a8585422c47177a67609b7a41e3542d6 # Parent 2849b02700e5a346abf56cd84bac96638d0e1e70 Remove pointless condition. The menu has an image for sure. Otherwise skin parsing had aborted with error. diff -r 2849b02700e5 -r 8e5a3da0a858 gui/ui/menu.c --- a/gui/ui/menu.c Sat Jan 26 00:45:58 2013 +0000 +++ b/gui/ui/menu.c Sat Jan 26 00:53:25 2013 +0000 @@ -45,7 +45,7 @@ uint32_t * drw = NULL; int x,y,tmp; - if ( !guiApp.menuIsPresent || !guiApp.menu.Bitmap.Image ) return; + if ( !guiApp.menuIsPresent ) return; if ( !uiMenuRender && !guiApp.menuWindow.Visible ) return; if ( uiMenuRender || menuItem != oldMenuItem ) @@ -75,8 +75,6 @@ { int x,y,i; - if ( !guiApp.menu.Bitmap.Image ) return; - menuItem=-1; x=X - guiApp.menuWindow.X; y=Y - guiApp.menuWindow.Y; @@ -98,7 +96,7 @@ void uiMenuInit( void ) { - if ( !guiApp.menuIsPresent || !guiApp.menu.Bitmap.Image ) return; + if ( !guiApp.menuIsPresent ) return; guiApp.menu.x=0; guiApp.menu.y=0; @@ -134,7 +132,7 @@ { int x,y; - if ( !guiApp.menuIsPresent || !guiApp.menu.Bitmap.Image ) return; + if ( !guiApp.menuIsPresent ) return; x=mx; if ( x + guiApp.menuWindow.Width > wsMaxX ) x=wsMaxX - guiApp.menuWindow.Width - 1 + wsOrgX; @@ -157,7 +155,7 @@ { int x,y,i=menuItem; - if ( !guiApp.menuIsPresent || !guiApp.menu.Bitmap.Image ) return; + if ( !guiApp.menuIsPresent ) return; x=mx-menuX; y=my-menuY;