graphics: Rename title screen.

By popular vote[1] on Doomworld we are ditching the "Ultimate" name
for Freedoom 1; the two IWADs are now named "Freedoom: Phase 1" and
"Freedoom: Phase 2". Rework the title screen to incorporate the logo
from the menu, and add a matching logo for FreeDM.

[1] http://www.doomworld.com/vb/freedoom/66855-renaming

.gitignore

@@ -1,8 +1,7 @@
 *.html
 deutex.log
-graphics/titlepic/freedm.gif
+graphics/titlepic/fd?title.gif
-graphics/titlepic/freedoom.gif
+graphics/titlepic/m_*.gif
-graphics/titlepic/ultdoom.gif
 lumps/cph/misc-lumps/*map.lmp
 lumps/cph/misc-lumps/playpal.lmp
 lumps/freedoom.lmp

buildcfg.txt

@@ -580,12 +580,15 @@ D_ULTIMA = D_DM32
 [graphics]
 
 #ifdef ULTDOOM
-TITLEPIC 0 0          = doomuttl
+TITLEPIC 0 0          = fd1title
+M_DOOM
 #else
 #ifdef FREEDM
-TITLEPIC 0 0          = dmttl
+TITLEPIC 0 0          = fdmtitle
+M_DOOM                = m_dm
 #else
-TITLEPIC 0 0          = doomttl
+TITLEPIC 0 0          = fd2title
+M_DOOM
 #endif
 #endif
 
@@ -765,7 +768,6 @@ STFKILL4	-5	-2
 STFGOD0	-5	-2
 STFDEAD0	-5	-1
 M_EPISOD	0	0
-M_DOOM	-1	-1
 M_RDTHIS	0	0
 M_OPTION	0	0
 M_QUITG	0	0

graphics/dmttl.gif

@@ -1 +0,0 @@
-titlepic/freedm.gif

graphics/doomttl.gif

@@ -1 +0,0 @@
-titlepic/freedoom.gif

graphics/doomuttl.gif

@@ -1 +0,0 @@
-titlepic/ultdoom.gif

graphics/fd1title.gif

@@ -0,0 +1 @@
+titlepic/fd1title.gif

graphics/fd2title.gif

@@ -0,0 +1 @@
+titlepic/fd2title.gif

graphics/fdmtitle.gif

@@ -0,0 +1 @@
+titlepic/fdmtitle.gif

graphics/m_dm.gif

@@ -0,0 +1 @@
+ajapted/m_dm.gif

graphics/titlepic/Makefile

@@ -1,15 +1,21 @@
-titlepic: freedoom.gif freedm.gif ultdoom.gif
+titlepic: fd1title.gif fd2title.gif fdmtitle.gif
 
-freedoom.gif: titlepic.gif
+m_doom.gif: ../m_doom.gif
-	./create_caption Freedoom $@
+	convert -transparent '#00ffff' ../m_doom.gif m_doom.gif
 
-freedm.gif: titlepic.gif
+m_dm.gif: ../m_dm.gif
-	./create_caption FreeDM $@
+	convert -transparent '#00ffff' ../m_dm.gif m_dm.gif
 
-ultdoom.gif: titlepic.gif
+fd1title.gif: titlepic.gif m_doom.gif
-	./create_caption "\"Ultimate Freedoom\"" $@
+	./create_caption m_doom.gif "Phase 1" $@
+
+fd2title.gif: titlepic.gif m_doom.gif
+	./create_caption m_doom.gif "Phase 2" $@
+
+fdmtitle.gif: titlepic.gif m_dm.gif
+	./create_caption m_dm.gif "Deathmatch" $@
 
 clean:
-	rm -f freedm.gif freedoom.gif ultdoom.gif
+	rm -f m_dm.gif m_doom.gif fd1title.gif fd2title.gif fdmtitle.gif
 
 .PHONY: clean

graphics/titlepic/create_caption

@@ -3,15 +3,17 @@
 DATE=`date +%Y/%m/%d`
 VERSION=`git describe` || VERSION=`cat ../../VERSION`
 
-convert -fill white -font Helvetica-Bold                               \
+convert titlepic.gif -fill white -font Helvetica-Bold                  \
-  -pointsize 30                                                        \
+  -draw "image over 94,2 0,0 '$1'"                                     \
+  -pointsize 20                                                        \
     -gravity north                                                     \
-      -draw "text 0,30 $1"                                             \
+      -draw "fill black stroke-width 4 stroke black text -5,65 '$2'"   \
+      -draw "text -4.5,65 '$2'"                                        \
   -pointsize 11                                                        \
     -gravity southwest                                                 \
       -draw "text 5,5 'http://freedoom.github.io/'"                    \
     -gravity southeast                                                 \
       -draw "text 10,25 'Version: $VERSION'"                           \
       -draw "text 10,5 '$DATE'"                                        \
-    titlepic.gif $2
+    $3