diff --git a/graphics/credit.gif b/graphics/credit.gif new file mode 120000 index 00000000..298ba125 --- /dev/null +++ b/graphics/credit.gif @@ -0,0 +1 @@ +text/credit.gif \ No newline at end of file diff --git a/graphics/text/Makefile b/graphics/text/Makefile index 01ac4bab..4ba20223 100644 --- a/graphics/text/Makefile +++ b/graphics/text/Makefile @@ -13,7 +13,7 @@ TEXTGEN_GRAPHICS = \ m_mess.gif m_mouse.gif m_multi.gif m_player.gif m_serial.gif \ m_setup.gif m_sound.gif m_stat.gif m_status.gif m_tcpip.gif \ m_versen.gif m_video.gif m_wad.gif m_wadopt.gif m_weap.gif \ - prboom.gif helpttl.gif \ + prboom.gif helpttl.gif freettl.gif \ m_ultra.gif wibp1.gif wibp2.gif wibp3.gif wibp4.gif \ wicolon.gif wienter.gif wif.gif wifrgs.gif wipcnt.gif \ wiminus.gif wimstar.gif wimstt.gif wiostf.gif wiosti.gif \ @@ -37,7 +37,7 @@ TEXTGEN_GRAPHICS = \ wilv33.gif wilv34.gif wilv35.gif wilv36.gif wilv37.gif \ wilv38.gif -all: $(TEXTGEN_GRAPHICS) help.gif +all: $(TEXTGEN_GRAPHICS) help.gif credit.gif # textgen creates multiple outputs, which is awkward to express in # make. Use a witness file (graphics.stamp) as suggested in the @@ -126,6 +126,19 @@ help.gif: helpbg.png helptext2.png -draw 'image over 0,0 0,0 helptext2.png' \ help.gif +credtext.png: freettl.gif credit.txt + python smtextgen credtext.png 320x200 \ + 120,5 "file:freettl.gif" \ + 10,30 "include:credit.txt" + +credtext2.png: credtext.png + convert credtext.png -transparent '#00ffff' credtext2.png + +credit.gif: helpbg.png credtext2.png + convert helpbg.png \ + -draw 'image over 0,0 0,0 credtext2.png' \ + credit.gif + clean: rm -f $(TEXTGEN_GRAPHICS) helpbg.png help.gif \ helptext.png helptext2.png graphics.stamp *.pyc diff --git a/graphics/text/config.py b/graphics/text/config.py index fa39a5e2..3425fe51 100644 --- a/graphics/text/config.py +++ b/graphics/text/config.py @@ -109,6 +109,8 @@ blue_graphics = { red_graphics = { # Title for the HELP/HELP1 screen: 'helpttl': 'Help', + # Title for CREDIT + 'freettl': 'Freedoom', 'm_ngame': 'New Game', 'm_option': 'Options', diff --git a/graphics/text/credit.txt b/graphics/text/credit.txt new file mode 100644 index 00000000..18fd3b3a --- /dev/null +++ b/graphics/text/credit.txt @@ -0,0 +1,20 @@ +Freedoom is a collaborative effort to +create a complete free content game. +It is the combined work of many, many +different artists, musicians, level +designers and programmers, more than is +possible to list on this page alone. +Thanks go to everyone who has contributed +and helped to make Freedoom a reality. + +Freedoom is distributed as free software +under the terms of the BSD license, and is +under continual development and +improvement. If you like the project and +want to help make it better, visit the +Freedoom website: + + http://freedoom.github.io/ + +Thanks for playing. + diff --git a/graphics/text/smtextgen b/graphics/text/smtextgen index 0b88012b..d15f3a04 100755 --- a/graphics/text/smtextgen +++ b/graphics/text/smtextgen @@ -154,6 +154,11 @@ command_line = [ ] for xy, string in args['strings']: + # Allow contents of a file to be included with special prefix: + if string.startswith('include:'): + with open(string[8:]) as f: + string = f.read() + # Allow special notation to indicate an image file to just draw # rather than rendering a string. if string.startswith('file:'):