[openjk] 04/32: [MP/SP] Display "Custom" for multi choice menu items

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit 72ae574e3aa1c60faaf56b76c356b67a03c8c47a
Author: Ensiform <ensiform at gmail.com>
Date:   Thu Feb 23 19:20:52 2017 -0600

    [MP/SP] Display "Custom" for multi choice menu items
    
    In basejka and jk2, an empty string is displayed for a setting that is not listed in the menu entry. This most noticeably affects the video resolution option to at least say "Custom" instead of blank when using r_mode -1 or -2 etc.
---
 code/ui/ui_shared.cpp | 6 +++++-
 codemp/ui/ui_shared.c | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/ui/ui_shared.cpp b/code/ui/ui_shared.cpp
index 00614b1..fe0c64c 100644
--- a/code/ui/ui_shared.cpp
+++ b/code/ui/ui_shared.cpp
@@ -3045,7 +3045,11 @@ const char *Item_Multi_Setting(itemDef_t *item)
  		}
 	}
 
-	return "";
+#ifdef JK2_MODE
+	return "@MENUS1_CUSTOM";
+#else
+	return "@MENUS_CUSTOM";
+#endif
 }
 
 //---------------------------------------------------------------------------------------------------------
diff --git a/codemp/ui/ui_shared.c b/codemp/ui/ui_shared.c
index b10c6fe..b529d26 100644
--- a/codemp/ui/ui_shared.c
+++ b/codemp/ui/ui_shared.c
@@ -3370,7 +3370,7 @@ const char *Item_Multi_Setting(itemDef_t *item) {
  			}
  		}
 	}
-	return "";
+	return "@MENUS_CUSTOM";
 }
 
 qboolean Item_Multi_HandleKey(itemDef_t *item, int key)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git