Merge bce871bba2 into 1791ff4dca

.gitignore

@@ -37,6 +37,7 @@ doom.gpl
 /graphics/fd*title.png
 /graphics/help.png
 /graphics/m_*.png
+/graphics/mbftext.png
 /graphics/prboom.png
 /graphics/t_phase*.png
 !/graphics/m_dm.png

buildcfg.txt

@@ -838,42 +838,56 @@ M_LSLEFT	3	11
 M_LSCNTR	3	11
 M_LSRGHT	3	11
 
-PRBOOM		0	1
-M_GENERL	0	1
-M_SETUP		0	1
-M_KEYBND	0	1
-M_WEAP		0	1
-M_STAT		0	1
-M_AUTO		0	1
-M_ENEM		0	1
-M_MESS		0	1
-M_CHAT		0	1
+; Source port menu
+; Boom
 M_HORSEN	0	1
 M_VERSEN	0	1
+M_SETUP		0	1
+M_KEYBND	0	1
+M_AUTO		0	1
+M_CHAT		0	1
+M_ENEM		0	1
+M_STAT		0	1
+M_WEAP		0	1
+M_MESS		0	1
+
+; MBF
+M_COMPAT	0	1
+MBFTEXT		0	1
+
+; PrBoom/PrBoom+
+PRBOOM		0	1
+M_GENERL	0	1
 M_LOKSEN	0	1
 M_ACCEL		0	1
+
+; SMMU
 M_ABOUT		0	1
-M_CHATM		0	1
-M_COMPAT	0	1
 M_DEMOS		0	1
-M_DMFLAG	0	1
-M_ETCOPT	0	1
 M_FEAT		0	1
-M_GSET		0	1
 M_HUD		0	1
-M_JOYSET	0	1
 M_LDSV		0	1
-M_MENUS		0	1
+M_MISC		0	1
 M_MOUSE		0	1
 M_MULTI		0	1
-M_PLAYER	0	1
 M_SERIAL	0	1
 M_SOUND		0	1
-M_STATUS	0	1
 M_TCPIP		0	1
 M_VIDEO		0	1
 M_WAD		0	1
+
+; Eternity
+M_CHATM		0	1
+M_DMFLAG	0	1
+M_ETCOPT	0	1
+M_GSET		0	1
+M_MENUS		0	1
+M_PLAYER	0	1
+M_STATUS	0	1
 M_WADOPT	0	1
+
+; Misc
+M_JOYSET	0	1
 M_CRISPY	0	1
 M_LVLTBL	0	1
 M_CSTSKL	0	1

graphics/text/Makefile

@@ -16,7 +16,7 @@ TEXTGEN_GRAPHIC_LUMPS = \
   m_mess.png   m_mouse.png  m_multi.png  m_player.png m_serial.png \
   m_setup.png  m_sound.png  m_stat.png   m_status.png m_tcpip.png  \
   m_versen.png m_video.png  m_wad.png    m_wadopt.png m_weap.png   \
-  m_crispy.png m_lvltbl.png m_cstskl.png                           \
+  m_crispy.png m_lvltbl.png m_cstskl.png mbftext.png  m_misc.png   \
   prboom.png   t_phase1.png t_phase2.png                           \
   m_ultra.png  wibp1.png    wibp2.png    wibp3.png    wibp4.png    \
   wicolon.png  wienter.png  wif.png      wifrgs.png   wipcnt.png   \

graphics/text/config.py

@@ -190,55 +190,57 @@ red_graphics = {
     "wiminus": "-",
     "wienter": "ENTERING",
 #    "m_pause": "pause",  # Doom is hard-coded to assume M_PAUSE is 68px, FD's font makes it 52
-    # Extra graphics used in PrBoom's menus. Generate these as well
-    # so that when we play in PrBoom the menus look consistent.
-    "prboom": "PrBoom",
-    "m_generl": "General",
-    "m_setup": "Setup",
-    "m_keybnd": "Key Bindings",
-    "m_weap": "Weapons",
-    "m_stat": "Status Bar/HUD",
-    "m_auto": "Automap",
-    "m_enem": "Enemies",
-    "m_mess": "Messages",
-    "m_chat": "Chat Strings",
+
+    # Source port specific graphics start here
+    # Boom:
     "m_horsen": "horizontal",
     "m_versen": "vertical",
+    "m_setup": "Setup",
+    "m_keybnd": "Key Bindings",
+    "m_auto": "Automap",
+    "m_chat": "Chat Strings",
+    "m_enem": "Enemies",
+    "m_stat": "Status Bar/HUD",
+    "m_weap": "Weapons",
+    "m_mess": "Messages",
+    # MBF:
+    "m_compat": "Compatibility",
+    "mbftext": "Marine's Best Friend",
+    # PrBoom/PrBoom+:
+    "prboom": "PrBoom",
+    "m_generl": "General",
     "m_loksen": "mouse look",
     "m_accel": "acceleration",
-    # Extra graphics from SMMU/Eternity Engine:
+    # SMMU:
     "m_about": "about",
-    "m_chatm": "Chat Strings",
-    "m_compat": "Compatibility",
     "m_demos": "demos",
-    "m_dmflag": "deathmatch flags",
-    "m_etcopt": "eternity options",
+    "m_multi": "Multiplayer",
     "m_feat": "Features",
-    "m_gset": "game settings",
     "m_hud": "heads up display",
-    "m_joyset": "joysticks",
     "m_ldsv": "Load/Save",
-    "m_menus": "Menu Options",
+    "m_misc": "misc. game options",
     "m_mouse": "mouse options",
-    "m_player": "player setup",
     "m_serial": "serial connection",
     "m_sound": "sound options",
-    "m_status": "status bar",
     "m_tcpip": "tcp/ip connection",
     "m_video": "video options",
     "m_wad": "load wad",
+    # Eternity:
+    "m_chatm": "Chat Strings",
+    "m_dmflag": "deathmatch flags",
+    "m_etcopt": "eternity options",
+    "m_gset": "game settings",
+    "m_menus": "Menu Options",
+    "m_player": "player setup",
+    "m_status": "status bar",
     "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",
+    # Unknown:
+    "m_joyset": "joysticks",
     # Crispy Doom's Crispness menu:
     "m_crispy": "Crispness",
-    # DSDA's Level Table
+    # DSDA's Level Table:
     "m_lvltbl": "Level Table",
-    # Nugget's Custom Skill
+    # Woof & Nugget's Custom Skill:
     "m_cstskl": "Custom Skill...",
 }