From 55943ca46f5b179be7d7017a488b6c1e7e4391f0 Mon Sep 17 00:00:00 2001
From: Mike Swanson <mikeonthecomputer@gmail.com>
Date: Thu, 23 Feb 2017 08:13:54 -0800
Subject: [PATCH] Make sure titlepic logo and menu logo are in the same
 location.

This gives a nice effect of blending the title in with the menu.
We actually used to do this, but it broke with a title screen update.
Thanks @JNechaevsky for the suggestion.

Closes #388
---
 buildcfg.txt                     | 27 +++++++++++++--------------
 graphics/titlepic/create_caption |  3 +--
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/buildcfg.txt b/buildcfg.txt
index 7ad261db..bb395043 100644
--- a/buildcfg.txt
+++ b/buildcfg.txt
@@ -9,7 +9,7 @@
 ; -DSHAREWARE to build for shareware doom
 ;
 
-; sanity checks: 
+; sanity checks:
 
 #ifdef FREEDM
 #define DOOM2
@@ -569,14 +569,14 @@ D_ULTIMA = D_DM32
 
 #ifdef ULTDOOM
 TITLEPIC 0 0          = fd1title
-M_DOOM   24 -18
+M_DOOM   13 -16
 #else
 #ifdef FREEDM
 TITLEPIC 0 0          = fdmtitle
 M_DOOM   40 -5        = m_dm
 #else
 TITLEPIC 0 0          = fd2title
-M_DOOM   24 -18
+M_DOOM   13 -16
 #endif
 #endif
 
@@ -766,8 +766,8 @@ M_QUITG	0	0
 M_NGAME	0	0
 #ifdef FREEDM
 M_SKULL1 = m_rokt1    16     -4
-M_SKULL2 = m_rokt2    16     -4 
-#else 
+M_SKULL2 = m_rokt2    16     -4
+#else
 M_SKULL1	0	-1
 M_SKULL2	0	-1
 #endif
@@ -1533,7 +1533,7 @@ SSWVH4H6 15 62
 SSWVH5   18 61
 SSWVI0   25 59
 SSWVJ0   28 53
-SSWVK0   26 43 
+SSWVK0   26 43
 SSWVL0   23 22
 SSWVM0   21  7
 SSWVN0   26 66
@@ -2094,12 +2094,12 @@ SKULC8C2        18      39
 SKULC7C3        19      43
 SKULC6C4        16      42
 SKULC5  20      43
-SKULD1  22      44      
+SKULD1  22      44
 SKULD8D2        18      39
 SKULD7D3        19      43
 SKULD6D4        16      42
 SKULD5  20      43
-SKULE1  22      44      
+SKULE1  22      44
 SKULE8E2        18      39
 SKULE7E3        19      43
 SKULE6E4        16      42
@@ -2592,10 +2592,10 @@ BLOOD2
 BLOOD3
 CEIL1_2
 CEIL1_3
-CEIL3_1 
-CEIL3_2 
+CEIL3_1
+CEIL3_2
 CEIL3_4
-CEIL3_5 
+CEIL3_5
 CEIL3_6
 CEIL4_3
 CEIL5_1
@@ -2735,8 +2735,8 @@ CRATOP1
 CRATOP2
 FLAT19
 MFLR8_2
-;These are Aquatex flats. 
-SWATER1                
+;These are Aquatex flats.
+SWATER1
 SWATER2
 SWATER3
 SWATER4
@@ -2816,4 +2816,3 @@ AQF073
 AQF074
 AQF075
 AQF076
-
diff --git a/graphics/titlepic/create_caption b/graphics/titlepic/create_caption
index 916bab25..73a9cd73 100755
--- a/graphics/titlepic/create_caption
+++ b/graphics/titlepic/create_caption
@@ -32,11 +32,10 @@ draw_with_footer() {
 if [ $# = 4 ]; then
 	draw_with_footer "$1" "$4"                                          \
 	  -gravity north                                                    \
-	  -draw "image over -6,2 0,0 '$2'"                                  \
+	  -draw "image over 0,18 0,0 '$2'"                                  \
 	  -pointsize 20                                                     \
 	    -draw "fill black stroke-width 4 stroke black text -5,160 '$3'" \
 	    -draw "text -5,160 '$3'"
 else
 	draw_with_footer "$1" "$2"
 fi
-