From 62eb3468b144f2e488a49d5f8c607b3e0c9d22f5 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Mon, 4 Sep 2017 21:42:17 +0200 Subject: [PATCH] Disregard the last commit or something, misunderstood request. --- Source/Menu/Defs.h | 1 - Source/Menu/Init.c | 1 - Source/Menu/Objects.c | 4 ++-- freecs/menu.dat | Bin 29238 -> 29198 bytes 4 files changed, 2 insertions(+), 4 deletions(-) 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 c2a0aa454d110f04c67766b568ec82485a149252..af3896f86ed551532e5f3fa99ebbfc43cd691517 100755 GIT binary patch delta 7643 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 delta 7943 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