From 227ec720e6fe0a37f2e90229cee9a61ad8ac1cde Mon Sep 17 00:00:00 2001
From: Mike Swanson <mikeonthecomputer@gmail.com>
Date: Thu, 10 May 2018 19:28:49 -0700
Subject: [PATCH] Support running in Doom 3: BFG Edition

There are a few lumps added to the Doom IWADs required by the BFG Edition
of the game that would cause it to crash abnormally if the IWADs were
replaced by Freedoom.  We add these news graphics lumps to the game here.

BFG Edition also changes m_gdhigh to "Fullscreen:" and m_scrnsz to
"Gamepad:", neither change of which will ever be reflected in Freedoom,
but it won't crash in this engine anymore.

Closes: #529
---
 buildcfg.txt            | 12 +++++++++++-
 graphics/.gitignore     |  4 ++++
 graphics/text/Makefile  |  1 +
 graphics/text/config.py |  6 ++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/buildcfg.txt b/buildcfg.txt
index a1522769..0e266abd 100644
--- a/buildcfg.txt
+++ b/buildcfg.txt
@@ -567,15 +567,19 @@ D_ULTIMA = D_DM32
 ; List of Pictures (with insertion point)
 [graphics]
 
+; DMENUPIC is for Doom 3: BFG Edition
 #ifdef ULTDOOM
 TITLEPIC 0 0          = fd1title
+DMENUPIC 0 0          = fd1title
 M_DOOM   13 -16
 #else
 #ifdef FREEDM
 TITLEPIC 0 0          = fdmtitle
+DMENUPIC 0 0          = fdmtitle
 M_DOOM   40 -5        = m_dm
 #else
 TITLEPIC 0 0          = fd2title
+DMENUPIC 0 0          = fd2title
 M_DOOM   13 -16
 #endif
 #endif
@@ -833,7 +837,7 @@ M_JOYSET	0	1
 M_LDSV		0	1
 M_MENUS		0	1
 M_MOUSE		0	1
-M_MULTI		0	0
+M_MULTI		0	1
 M_PLAYER	0	1
 M_SERIAL	0	1
 M_SOUND		0	1
@@ -843,6 +847,12 @@ M_VIDEO		0	1
 M_WAD		0	1
 M_WADOPT	0	1
 
+; Doom 3: BFG Edition support
+M_ACPT		0	1
+M_CAN		0	1
+M_CHG		0	1
+M_EXITO		0	1
+
 BRDR_TL	-5	-5
 BRDR_T	0	-5
 BRDR_TR	0	-5
diff --git a/graphics/.gitignore b/graphics/.gitignore
index dfe34a74..5c5dc3bc 100644
--- a/graphics/.gitignore
+++ b/graphics/.gitignore
@@ -8,9 +8,12 @@ credit.png
 help.png
 m_about.png
 m_accel.png
+m_acpt.png
 m_auto.png
+m_can.png
 m_chat.png
 m_chatm.png
+m_chg.png
 m_compat.png
 m_demos.png
 m_detail.png
@@ -22,6 +25,7 @@ m_enem.png
 m_epi?.png
 m_episod.png
 m_etcopt.png
+m_exito.png
 m_feat.png
 m_gdhigh.png
 m_gdlow.png
diff --git a/graphics/text/Makefile b/graphics/text/Makefile
index 1507b32c..305a3164 100644
--- a/graphics/text/Makefile
+++ b/graphics/text/Makefile
@@ -15,6 +15,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_acpt.png   m_can.png    m_chg.png    m_exito.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   \
diff --git a/graphics/text/config.py b/graphics/text/config.py
index 7f7bbd30..290efa19 100644
--- a/graphics/text/config.py
+++ b/graphics/text/config.py
@@ -194,6 +194,12 @@ red_graphics = {
 	# 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',
+
+	# Doom 3: BFG Edition support
+	'm_acpt': 'accept',
+	'm_can': 'cancel',
+	'm_chg': 'change game',
+	'm_exito': 'are you sure?',
 }
 
 def read_bex_lump(filename):