From 3d43f1c346c8c4943d23b453e5b96817836ed95b Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Tue, 28 Oct 2014 20:46:14 +0000 Subject: [PATCH] Fix the menu animations so that they are what I actually intended. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4689 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/menus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c index 75ea2827f..d1fb8f97c 100644 --- a/polymer/eduke32/source/menus.c +++ b/polymer/eduke32/source/menus.c @@ -3141,11 +3141,11 @@ static MenuAnimation_t m_animation; int32_t M_Anim_SinRight(void) { - return sintable[scale(512, totalclock - m_animation.start, m_animation.length) + 512]; + return sintable[scale(1024, totalclock - m_animation.start, m_animation.length) + 512] + 16384; } int32_t M_Anim_SinLeft(void) { - return sintable[scale(512, totalclock - m_animation.start, m_animation.length)]; + return -sintable[scale(1024, totalclock - m_animation.start, m_animation.length) + 512] + 16384; } void M_ChangeMenuAnimate(int32_t cm, MenuAnimationType_t animtype) @@ -4943,7 +4943,7 @@ void M_DisplayMenus(void) vec2_t previousOrigin = { 0, 0 }; const int32_t screenwidth = scale(240<<16, xdim, ydim); - origin.x = scale(screenwidth, m_animation.func(), 16384); + origin.x = scale(screenwidth, m_animation.func(), 32768); previousOrigin.x = origin.x - screenwidth; M_RunMenu(m_animation.a, previousOrigin);