diff --git a/CREDITS b/CREDITS index 6b3ded8a..2513503e 100644 --- a/CREDITS +++ b/CREDITS @@ -696,3 +696,8 @@ N: Mikael Haladyn E: mikaelhhome@yahoo.dk S: nub_hat D: levels, musics + +F: captainw +S: CaptainW +E: avortement.rate@gmail.com +D: graphics diff --git a/buildcfg.txt b/buildcfg.txt index 54e42575..5c408e5a 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -613,7 +613,7 @@ M_DOOM #else #ifdef FREEDM TITLEPIC 0 0 = fdmtitle -M_DOOM = m_dm +M_DOOM 40 -5 = m_dm #else TITLEPIC 0 0 = fd2title M_DOOM diff --git a/graphics/ajapted/m_dm.gif b/graphics/ajapted/m_dm.gif deleted file mode 100644 index 7435dc94..00000000 Binary files a/graphics/ajapted/m_dm.gif and /dev/null differ diff --git a/graphics/captainw/fdmtitle.gif b/graphics/captainw/fdmtitle.gif new file mode 100644 index 00000000..7a704bc2 Binary files /dev/null and b/graphics/captainw/fdmtitle.gif differ diff --git a/graphics/captainw/freedm_title.png b/graphics/captainw/freedm_title.png new file mode 100644 index 00000000..e9262748 Binary files /dev/null and b/graphics/captainw/freedm_title.png differ diff --git a/graphics/captainw/m_dm.gif b/graphics/captainw/m_dm.gif new file mode 100644 index 00000000..059816f3 Binary files /dev/null and b/graphics/captainw/m_dm.gif differ diff --git a/graphics/m_dm.gif b/graphics/m_dm.gif index 5f395e7b..8e3629be 120000 --- a/graphics/m_dm.gif +++ b/graphics/m_dm.gif @@ -1 +1 @@ -ajapted/m_dm.gif \ No newline at end of file +captainw/m_dm.gif \ No newline at end of file diff --git a/graphics/titlepic/Makefile b/graphics/titlepic/Makefile index c78afbf8..b0c16555 100644 --- a/graphics/titlepic/Makefile +++ b/graphics/titlepic/Makefile @@ -7,13 +7,13 @@ m_dm.gif: ../m_dm.gif convert -transparent '#00ffff' ../m_dm.gif m_dm.gif fd1title.gif: titlepic.gif m_doom.gif - ./create_caption m_doom.gif "Phase 1" $@ + ./create_caption titlepic.gif m_doom.gif "Phase 1" $@ fd2title.gif: titlepic.gif m_doom.gif - ./create_caption m_doom.gif "Phase 2" $@ + ./create_caption titlepic.gif m_doom.gif "Phase 2" $@ -fdmtitle.gif: titlepic.gif m_dm.gif - ./create_caption m_dm.gif "Deathmatch" $@ +fdmtitle.gif: ../captainw/fdmtitle.gif + ./create_caption ../captainw/fdmtitle.gif $@ clean: rm -f m_dm.gif m_doom.gif fd1title.gif fd2title.gif fdmtitle.gif diff --git a/graphics/titlepic/create_caption b/graphics/titlepic/create_caption index 10b976a0..223d6260 100755 --- a/graphics/titlepic/create_caption +++ b/graphics/titlepic/create_caption @@ -1,14 +1,28 @@ #!/bin/sh -convert titlepic.gif -fill white -font Helvetica-Bold \ - -draw "image over 94,2 0,0 '$1'" \ - -pointsize 20 \ - -gravity north \ - -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,5 'Version: $VERSION'" \ - $3 +draw_with_footer() { + input_file=$1; + output_file=$2; + shift; shift + + convert $input_file -fill white -font Helvetica-Bold \ + -pointsize 11 \ + -gravity southwest \ + -draw "text 5,5 'https://freedoom.github.io/'" \ + -gravity southeast \ + -draw "text 10,5 'Version: $VERSION'" \ + "$@" \ + $output_file +} + +if [ $# = 4 ]; then + draw_with_footer "$1" "$4" \ + -gravity north \ + -draw "image over -6,2 0,0 '$2'" \ + -pointsize 20 \ + -draw "fill black stroke-width 4 stroke black text -5,65 '$3'" \ + -draw "text -4.5,65 '$3'" +else + draw_with_footer "$1" "$2" +fi + diff --git a/patches/captainw/logo.gif b/patches/captainw/logo.gif new file mode 100644 index 00000000..2a54bf84 Binary files /dev/null and b/patches/captainw/logo.gif differ diff --git a/patches/logo.gif b/patches/logo.gif index a94736e2..354f3fa6 120000 --- a/patches/logo.gif +++ b/patches/logo.gif @@ -1 +1 @@ -rellik/logo.gif \ No newline at end of file +captainw/logo.gif \ No newline at end of file diff --git a/patches/rellik/logo.gif b/patches/rellik/logo.gif deleted file mode 100644 index b4df696b..00000000 Binary files a/patches/rellik/logo.gif and /dev/null differ