diff --git a/Source/Menu/Defs.h b/Source/Menu/Defs.h index 51369199..3dbb8b69 100644 --- a/Source/Menu/Defs.h +++ b/Source/Menu/Defs.h @@ -39,7 +39,6 @@ var float fButtonAlpha[8]; var float fScrollWheel; var vector vMenuButtonsSize; -var int iMenuButtonHeight; enum { SCROLL_NONE, diff --git a/Source/Menu/Init.c b/Source/Menu/Init.c index 563c7612..1109eb4a 100644 --- a/Source/Menu/Init.c +++ b/Source/Menu/Init.c @@ -42,7 +42,6 @@ void m_init( void ) { FONT_MENU = loadfont( "menu", "gfx/menuchars", "32", -1 ); vMenuButtonsSize = drawgetimagesize( "gfx/shell/btns_main" ); - iMenuButtonHeight = ( vMenuButtonsSize_y / MENU_BUTTONS ) / 3; } /* diff --git a/Source/Menu/Objects.c b/Source/Menu/Objects.c index 45ac0e2f..f911bd85 100644 --- a/Source/Menu/Objects.c +++ b/Source/Menu/Objects.c @@ -125,9 +125,9 @@ void Object_Button( vector vPosition, int iButtonID, void() vFunction, __inout f vector vSrcPos, vSrcSize; vSrcPos_x = 0; vSrcPos_y = ( 78 * iButtonID ) / vMenuButtonsSize_y; - vSrcSize = [ 1, iMenuButtonHeight / vMenuButtonsSize_y ]; + vSrcSize = [ 1, 26 / vMenuButtonsSize_y ]; drawsubpic( vPosition, '156 26', "gfx/shell/btns_main", vSrcPos, vSrcSize, '1 1 1', 1.0f, 1 ); - drawsubpic( vPosition, '156 26', "gfx/shell/btns_main", vSrcPos + [ 0, 52 / 5538 ], vSrcSize, '1 1 1', fAlpha, 1 ); + drawsubpic( vPosition, '156 26', "gfx/shell/btns_main", vSrcPos + [ 0, 52 / vMenuButtonsSize_y ], vSrcSize, '1 1 1', fAlpha, 1 ); } /* diff --git a/freecs/menu.dat b/freecs/menu.dat index c2a0aa45..af3896f8 100755 Binary files a/freecs/menu.dat and b/freecs/menu.dat differ