diff --git a/.gitignore b/.gitignore index 715f2426..2f8018fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,7 @@ *.html deutex.log -graphics/titlepic/freedm.gif -graphics/titlepic/freedoom.gif -graphics/titlepic/ultdoom.gif +graphics/titlepic/fd?title.gif +graphics/titlepic/m_*.gif lumps/cph/misc-lumps/*map.lmp lumps/cph/misc-lumps/playpal.lmp lumps/freedoom.lmp diff --git a/buildcfg.txt b/buildcfg.txt index 87175e46..9af2a932 100644 --- a/buildcfg.txt +++ b/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 diff --git a/graphics/ajapted/m_dm.gif b/graphics/ajapted/m_dm.gif new file mode 100644 index 00000000..7435dc94 Binary files /dev/null and b/graphics/ajapted/m_dm.gif differ diff --git a/graphics/dmttl.gif b/graphics/dmttl.gif deleted file mode 120000 index 49172eff..00000000 --- a/graphics/dmttl.gif +++ /dev/null @@ -1 +0,0 @@ -titlepic/freedm.gif \ No newline at end of file diff --git a/graphics/doomttl.gif b/graphics/doomttl.gif deleted file mode 120000 index 93b8c82a..00000000 --- a/graphics/doomttl.gif +++ /dev/null @@ -1 +0,0 @@ -titlepic/freedoom.gif \ No newline at end of file diff --git a/graphics/doomuttl.gif b/graphics/doomuttl.gif deleted file mode 120000 index 6afc1be1..00000000 --- a/graphics/doomuttl.gif +++ /dev/null @@ -1 +0,0 @@ -titlepic/ultdoom.gif \ No newline at end of file diff --git a/graphics/fd1title.gif b/graphics/fd1title.gif new file mode 120000 index 00000000..26620da4 --- /dev/null +++ b/graphics/fd1title.gif @@ -0,0 +1 @@ +titlepic/fd1title.gif \ No newline at end of file diff --git a/graphics/fd2title.gif b/graphics/fd2title.gif new file mode 120000 index 00000000..d4a4a434 --- /dev/null +++ b/graphics/fd2title.gif @@ -0,0 +1 @@ +titlepic/fd2title.gif \ No newline at end of file diff --git a/graphics/fdmtitle.gif b/graphics/fdmtitle.gif new file mode 120000 index 00000000..4db4bd3d --- /dev/null +++ b/graphics/fdmtitle.gif @@ -0,0 +1 @@ +titlepic/fdmtitle.gif \ No newline at end of file diff --git a/graphics/m_dm.gif b/graphics/m_dm.gif new file mode 120000 index 00000000..5f395e7b --- /dev/null +++ b/graphics/m_dm.gif @@ -0,0 +1 @@ +ajapted/m_dm.gif \ No newline at end of file diff --git a/graphics/titlepic/Makefile b/graphics/titlepic/Makefile index 5cb2c420..c78afbf8 100644 --- a/graphics/titlepic/Makefile +++ b/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 - ./create_caption Freedoom $@ +m_doom.gif: ../m_doom.gif + convert -transparent '#00ffff' ../m_doom.gif m_doom.gif -freedm.gif: titlepic.gif - ./create_caption FreeDM $@ +m_dm.gif: ../m_dm.gif + convert -transparent '#00ffff' ../m_dm.gif m_dm.gif -ultdoom.gif: titlepic.gif - ./create_caption "\"Ultimate Freedoom\"" $@ +fd1title.gif: titlepic.gif m_doom.gif + ./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 diff --git a/graphics/titlepic/create_caption b/graphics/titlepic/create_caption index f67e3dc9..26b8b862 100755 --- a/graphics/titlepic/create_caption +++ b/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 \ - -pointsize 30 \ +convert titlepic.gif -fill white -font Helvetica-Bold \ + -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