From 35c61c9318164016ee5eb9dc72ed0f6822bc528c Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 22 Feb 2014 03:07:03 +0000 Subject: [PATCH] textgen: Adjust M_MULTI graphic height, alignment. M_MULTI is used in some multiplayer ports (Zandronum, others?) for the main menu "Multiplayer" option. Make this taller to match the other main menu graphics and align appropriately in buildcfg. This conflicts with the height of the graphic as found in other ports like SMMU/Eternity/PrBoom, but I've checked, and in those ports it's either unused or short enough that it still works okay. --- buildcfg.txt | 2 +- graphics/text/config.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/buildcfg.txt b/buildcfg.txt index 8bae4f87..f2de0abf 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -860,7 +860,7 @@ M_JOYSET 0 1 M_LDSV 0 1 M_MENUS 0 1 M_MOUSE 0 1 -M_MULTI 0 1 +M_MULTI 0 0 M_PLAYER 0 1 M_SERIAL 0 1 M_SOUND 0 1 diff --git a/graphics/text/config.py b/graphics/text/config.py index 9356ed50..923a684a 100644 --- a/graphics/text/config.py +++ b/graphics/text/config.py @@ -183,7 +183,6 @@ red_graphics = { 'm_ldsv': 'Load/Save', 'm_menus': 'Menu Options', 'm_mouse': 'mouse options', - 'm_multi': 'multiplayer', 'm_player': 'player setup', 'm_serial': 'serial connection', 'm_sound': 'sound options', @@ -192,6 +191,12 @@ red_graphics = { 'm_video': 'video options', 'm_wad': 'load wad', 'm_wadopt': 'wad options', + # This is from SMMU too, and if we follow things to the letter, + # ought to be all lower-case. However, same lump name is used + # by other ports (Zandronum) which expect a taller graphic to + # match the other main menu graphics. Eternity Engine doesn't + # use it any more, and on SMMU there's enough space for it. + 'm_multi': 'Multiplayer', } def read_bex_lump(filename):