From 3473580f5f81f1a47abf9ab2aaf4d40c20dc28ca Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 20 Dec 2015 05:19:02 +0000
Subject: [PATCH] Menus: When RETURN is set to INT32_MIN in EVENT_CHANGEMENU,
 cancel any animations in addition to not changing the current menu.

git-svn-id: https://svn.eduke32.com/eduke32@5471 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/menus.c | 50 ++++++++++++++++++++++------------
 polymer/eduke32/source/menus.h |  2 +-
 2 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/polymer/eduke32/source/menus.c b/polymer/eduke32/source/menus.c
index e514b0046..6ada56b91 100644
--- a/polymer/eduke32/source/menus.c
+++ b/polymer/eduke32/source/menus.c
@@ -3453,25 +3453,39 @@ void M_ChangeMenuAnimate(int32_t cm, MenuAnimationType_t animtype)
     switch (animtype)
     {
         case MA_Advance:
-            m_animation.out = M_Anim_SinOutRight;
-            m_animation.in = M_Anim_SinInRight;
-            m_animation.start = totalclock;
-            m_animation.length = 30;
+        {
+            Menu_t * const previousMenu = m_currentMenu;
+
+            if (!M_ChangeMenu(cm))
+            {
+                m_animation.out = M_Anim_SinOutRight;
+                m_animation.in = M_Anim_SinInRight;
+                m_animation.start = totalclock;
+                m_animation.length = 30;
+
+                m_animation.previous = previousMenu;
+                m_animation.current = m_currentMenu;
+            }
 
-            m_animation.previous = m_currentMenu;
-            M_ChangeMenu(cm);
-            m_animation.current = m_currentMenu;
             break;
+        }
         case MA_Return:
-            m_animation.out = M_Anim_SinOutLeft;
-            m_animation.in = M_Anim_SinInLeft;
-            m_animation.start = totalclock;
-            m_animation.length = 30;
+        {
+            Menu_t * const previousMenu = m_currentMenu;
+
+            if (!M_ChangeMenu(cm))
+            {
+                m_animation.out = M_Anim_SinOutLeft;
+                m_animation.in = M_Anim_SinInLeft;
+                m_animation.start = totalclock;
+                m_animation.length = 30;
+
+                m_animation.previous = previousMenu;
+                m_animation.current = m_currentMenu;
+            }
 
-            m_animation.previous = m_currentMenu;
-            M_ChangeMenu(cm);
-            m_animation.current = m_currentMenu;
             break;
+        }
         default:
             m_animation.start = 0;
             m_animation.length = 0;
@@ -3480,7 +3494,7 @@ void M_ChangeMenuAnimate(int32_t cm, MenuAnimationType_t animtype)
     }
 }
 
-void M_ChangeMenu(MenuID_t cm)
+int M_ChangeMenu(MenuID_t cm)
 {
     Menu_t *search;
     int32_t i;
@@ -3502,7 +3516,7 @@ void M_ChangeMenu(MenuID_t cm)
         search = M_FindMenu(cm);
 
         if (search == NULL)
-            return;
+            return 0; // intentional, so that users don't use any random value as "don't change"
 
         m_previousMenu = m_currentMenu;
         g_previousMenu = g_currentMenu;
@@ -3510,7 +3524,7 @@ void M_ChangeMenu(MenuID_t cm)
         g_currentMenu = cm;
     }
     else
-        return;
+        return 1;
 
     switch (g_currentMenu)
     {
@@ -3586,6 +3600,8 @@ void M_ChangeMenu(MenuID_t cm)
 
         M_MenuEntryFocus(/*currentry*/);
     }
+
+    return 0;
 }
 
 
diff --git a/polymer/eduke32/source/menus.h b/polymer/eduke32/source/menus.h
index 6e2317a33..37780faf0 100644
--- a/polymer/eduke32/source/menus.h
+++ b/polymer/eduke32/source/menus.h
@@ -419,7 +419,7 @@ extern int32_t g_lastSaveSlot;
 extern int32_t g_quitDeadline;
 extern int32_t voting;
 int32_t menutext_(int32_t x,int32_t y,int32_t s,int32_t p,char *t,int32_t bits);
-void M_ChangeMenu(int32_t cm);
+int M_ChangeMenu(int32_t cm);
 void M_ChangeMenuAnimate(int32_t cm, MenuAnimationType_t animtype);
 int32_t M_IsTextInput(Menu_t *cm);
 void G_CheckPlayerColor(int32_t *color,int32_t prev_color);