From 868ab15f4352c3fd1facd1b05b9d4b199d15b4f2 Mon Sep 17 00:00:00 2001
From: Simon Howard <fraggle@gmail.com>
Date: Sun, 4 Jun 2006 15:33:28 +0000
Subject: [PATCH] Generate different titlepics for freedoom and freedm.

---
 buildcfg.txt                     |  8 +++++++-
 graphics/dmttl.ppm               |  1 +
 graphics/doomttl.ppm             |  1 +
 graphics/titlepic.ppm            |  1 -
 graphics/titlepic/Makefile       | 11 ++++++++---
 graphics/titlepic/create_caption |  4 ++--
 wadinfo-builder.pl               |  2 +-
 7 files changed, 20 insertions(+), 8 deletions(-)
 create mode 120000 graphics/dmttl.ppm
 create mode 120000 graphics/doomttl.ppm
 delete mode 120000 graphics/titlepic.ppm

diff --git a/buildcfg.txt b/buildcfg.txt
index dbf57940..bf4cecc1 100644
--- a/buildcfg.txt
+++ b/buildcfg.txt
@@ -500,6 +500,13 @@ D_DM2INT
 
 ; List of Pictures (with insertion point)
 [graphics]
+
+#ifdef FREEDM
+TITLEPIC 0 0          = dmttl
+#else
+TITLEPIC 0 0          = doomttl
+#endif
+
 #ifdef DOOM2
 HELP	0	0
 #endif
@@ -510,7 +517,6 @@ HELP2	0	0
 #endif
 #endif
 
-TITLEPIC	0	0
 CREDIT	0	0
 BOSSBACK	0	0
 AMMNUM0	-1	0
diff --git a/graphics/dmttl.ppm b/graphics/dmttl.ppm
new file mode 120000
index 00000000..e06978bc
--- /dev/null
+++ b/graphics/dmttl.ppm
@@ -0,0 +1 @@
+titlepic/freedm.ppm
\ No newline at end of file
diff --git a/graphics/doomttl.ppm b/graphics/doomttl.ppm
new file mode 120000
index 00000000..fa63ab08
--- /dev/null
+++ b/graphics/doomttl.ppm
@@ -0,0 +1 @@
+titlepic/freedoom.ppm
\ No newline at end of file
diff --git a/graphics/titlepic.ppm b/graphics/titlepic.ppm
deleted file mode 120000
index 202cd9f9..00000000
--- a/graphics/titlepic.ppm
+++ /dev/null
@@ -1 +0,0 @@
-titlepic/output.ppm
\ No newline at end of file
diff --git a/graphics/titlepic/Makefile b/graphics/titlepic/Makefile
index 7a1322c6..2eb5f439 100644
--- a/graphics/titlepic/Makefile
+++ b/graphics/titlepic/Makefile
@@ -1,3 +1,8 @@
-titlepic: 
-	./create_caption
-#	pnmtopng < output.ppm > output.png
+titlepic: freedoom.ppm freedm.ppm
+
+freedoom.ppm: base.ppm
+	./create_caption Freedoom $@
+
+freedm.ppm: base.ppm
+	./create_caption FreeDM $@
+
diff --git a/graphics/titlepic/create_caption b/graphics/titlepic/create_caption
index 02d3bd34..9c7d4f09 100755
--- a/graphics/titlepic/create_caption
+++ b/graphics/titlepic/create_caption
@@ -5,12 +5,12 @@ DATE=`date +%Y/%m/%d`
 convert -fill white -font Helvetica-Bold                               \
   -pointsize 30                                                        \
     -gravity north                                                     \
-      -draw "text 0,30 Freedoom"                                       \
+      -draw "text 0,30 $1"                                             \
   -pointsize 11                                                        \
     -gravity southwest                                                 \
       -draw "text 5,5 'http://freedoom.sourceforge.net/'"              \
     -gravity southeast                                                 \
       -draw "text 10,25 'Version: $VERSION'"                           \
       -draw "text 10,5 '$DATE'"                                        \
-    base.ppm output.ppm
+    base.ppm $2
 
diff --git a/wadinfo-builder.pl b/wadinfo-builder.pl
index ff96ca5b..813ee9b2 100755
--- a/wadinfo-builder.pl
+++ b/wadinfo-builder.pl
@@ -89,7 +89,7 @@ while (<STDIN>) {
 	 		if $section eq "texture1" ||
 			   $section eq "texture2";
 
-	} elsif (/^\s*(\S+)(\s*\=\s*(\S+))?/) {
+	} elsif (/^\s*(\S+)[^\=]*(\s*\=\s*(\S+))?/) {
 		
         my ($resname, $override) = ($1, $3);