From 1cb5232846ff1e5fe834c88176971784f355f6c9 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 30 Nov 2013 22:28:22 -0500 Subject: [PATCH] graphics: Add overrides for source port text lumps. Some source ports (PrBoom, Eternity Engine, etc.) come with their own PWAD files that include custom text graphic lumps for extended menus. Include some overrides in Freedoom for common ones, so that when playing in these ports the menus have a consistent look and feel. --- buildcfg.txt | 38 +++++++++++++++++++++++++++++++++++++ graphics/m_about.gif | 1 + graphics/m_accel.gif | 1 + graphics/m_auto.gif | 1 + graphics/m_chat.gif | 1 + graphics/m_chatm.gif | 1 + graphics/m_compat.gif | 1 + graphics/m_demos.gif | 1 + graphics/m_dmflag.gif | 1 + graphics/m_enem.gif | 1 + graphics/m_etcopt.gif | 1 + graphics/m_feat.gif | 1 + graphics/m_generl.gif | 1 + graphics/m_gset.gif | 1 + graphics/m_horsen.gif | 1 + graphics/m_hud.gif | 1 + graphics/m_joyset.gif | 1 + graphics/m_keybnd.gif | 1 + graphics/m_ldsv.gif | 1 + graphics/m_loksen.gif | 1 + graphics/m_menus.gif | 1 + graphics/m_mess.gif | 1 + graphics/m_mouse.gif | 1 + graphics/m_multi.gif | 1 + graphics/m_player.gif | 1 + graphics/m_serial.gif | 1 + graphics/m_setup.gif | 1 + graphics/m_sound.gif | 1 + graphics/m_stat.gif | 1 + graphics/m_status.gif | 1 + graphics/m_tcpip.gif | 1 + graphics/m_versen.gif | 1 + graphics/m_video.gif | 1 + graphics/m_wad.gif | 1 + graphics/m_wadopt.gif | 1 + graphics/m_weap.gif | 1 + graphics/prboom.gif | 1 + graphics/text/config.py | 42 +++++++++++++++++++++++++++++++++++++++++ 38 files changed, 116 insertions(+) create mode 120000 graphics/m_about.gif create mode 120000 graphics/m_accel.gif create mode 120000 graphics/m_auto.gif create mode 120000 graphics/m_chat.gif create mode 120000 graphics/m_chatm.gif create mode 120000 graphics/m_compat.gif create mode 120000 graphics/m_demos.gif create mode 120000 graphics/m_dmflag.gif create mode 120000 graphics/m_enem.gif create mode 120000 graphics/m_etcopt.gif create mode 120000 graphics/m_feat.gif create mode 120000 graphics/m_generl.gif create mode 120000 graphics/m_gset.gif create mode 120000 graphics/m_horsen.gif create mode 120000 graphics/m_hud.gif create mode 120000 graphics/m_joyset.gif create mode 120000 graphics/m_keybnd.gif create mode 120000 graphics/m_ldsv.gif create mode 120000 graphics/m_loksen.gif create mode 120000 graphics/m_menus.gif create mode 120000 graphics/m_mess.gif create mode 120000 graphics/m_mouse.gif create mode 120000 graphics/m_multi.gif create mode 120000 graphics/m_player.gif create mode 120000 graphics/m_serial.gif create mode 120000 graphics/m_setup.gif create mode 120000 graphics/m_sound.gif create mode 120000 graphics/m_stat.gif create mode 120000 graphics/m_status.gif create mode 120000 graphics/m_tcpip.gif create mode 120000 graphics/m_versen.gif create mode 120000 graphics/m_video.gif create mode 120000 graphics/m_wad.gif create mode 120000 graphics/m_wadopt.gif create mode 120000 graphics/m_weap.gif create mode 120000 graphics/prboom.gif diff --git a/buildcfg.txt b/buildcfg.txt index 2ed55f25..bf35b905 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -759,6 +759,44 @@ M_MUSVOL 0 1 M_LSLEFT 3 11 M_LSCNTR 3 11 M_LSRGHT 3 11 + +PRBOOM 0 1 +M_GENERL 0 1 +M_SETUP 0 1 +M_KEYBND 0 1 +M_WEAP 0 1 +M_STAT 0 1 +M_AUTO 0 1 +M_ENEM 0 1 +M_MESS 0 1 +M_CHAT 0 1 +M_HORSEN 0 1 +M_VERSEN 0 1 +M_LOKSEN 0 1 +M_ACCEL 0 1 +M_ABOUT 0 1 +M_CHATM 0 1 +M_COMPAT 0 1 +M_DEMOS 0 1 +M_DMFLAG 0 1 +M_ETCOPT 0 1 +M_FEAT 0 1 +M_GSET 0 1 +M_HUD 0 1 +M_JOYSET 0 1 +M_LDSV 0 1 +M_MENUS 0 1 +M_MOUSE 0 1 +M_MULTI 0 1 +M_PLAYER 0 1 +M_SERIAL 0 1 +M_SOUND 0 1 +M_STATU 0 1 +M_TCPIP 0 1 +M_VIDEO 0 1 +M_WAD 0 1 +M_WADOPT 0 1 + BRDR_TL -5 -5 BRDR_T 0 -5 BRDR_TR 0 -5 diff --git a/graphics/m_about.gif b/graphics/m_about.gif new file mode 120000 index 00000000..77a883eb --- /dev/null +++ b/graphics/m_about.gif @@ -0,0 +1 @@ +text/m_about.gif \ No newline at end of file diff --git a/graphics/m_accel.gif b/graphics/m_accel.gif new file mode 120000 index 00000000..1a0dd1fe --- /dev/null +++ b/graphics/m_accel.gif @@ -0,0 +1 @@ +text/m_accel.gif \ No newline at end of file diff --git a/graphics/m_auto.gif b/graphics/m_auto.gif new file mode 120000 index 00000000..1a7279f8 --- /dev/null +++ b/graphics/m_auto.gif @@ -0,0 +1 @@ +text/m_auto.gif \ No newline at end of file diff --git a/graphics/m_chat.gif b/graphics/m_chat.gif new file mode 120000 index 00000000..f2f1a2d6 --- /dev/null +++ b/graphics/m_chat.gif @@ -0,0 +1 @@ +text/m_chat.gif \ No newline at end of file diff --git a/graphics/m_chatm.gif b/graphics/m_chatm.gif new file mode 120000 index 00000000..0e433a3a --- /dev/null +++ b/graphics/m_chatm.gif @@ -0,0 +1 @@ +text/m_chatm.gif \ No newline at end of file diff --git a/graphics/m_compat.gif b/graphics/m_compat.gif new file mode 120000 index 00000000..a93f432e --- /dev/null +++ b/graphics/m_compat.gif @@ -0,0 +1 @@ +text/m_compat.gif \ No newline at end of file diff --git a/graphics/m_demos.gif b/graphics/m_demos.gif new file mode 120000 index 00000000..26c2e666 --- /dev/null +++ b/graphics/m_demos.gif @@ -0,0 +1 @@ +text/m_demos.gif \ No newline at end of file diff --git a/graphics/m_dmflag.gif b/graphics/m_dmflag.gif new file mode 120000 index 00000000..76b7401d --- /dev/null +++ b/graphics/m_dmflag.gif @@ -0,0 +1 @@ +text/m_dmflag.gif \ No newline at end of file diff --git a/graphics/m_enem.gif b/graphics/m_enem.gif new file mode 120000 index 00000000..14269f25 --- /dev/null +++ b/graphics/m_enem.gif @@ -0,0 +1 @@ +text/m_enem.gif \ No newline at end of file diff --git a/graphics/m_etcopt.gif b/graphics/m_etcopt.gif new file mode 120000 index 00000000..2cc93d83 --- /dev/null +++ b/graphics/m_etcopt.gif @@ -0,0 +1 @@ +text/m_etcopt.gif \ No newline at end of file diff --git a/graphics/m_feat.gif b/graphics/m_feat.gif new file mode 120000 index 00000000..8ff09330 --- /dev/null +++ b/graphics/m_feat.gif @@ -0,0 +1 @@ +text/m_feat.gif \ No newline at end of file diff --git a/graphics/m_generl.gif b/graphics/m_generl.gif new file mode 120000 index 00000000..c8da5641 --- /dev/null +++ b/graphics/m_generl.gif @@ -0,0 +1 @@ +text/m_generl.gif \ No newline at end of file diff --git a/graphics/m_gset.gif b/graphics/m_gset.gif new file mode 120000 index 00000000..5e7be409 --- /dev/null +++ b/graphics/m_gset.gif @@ -0,0 +1 @@ +text/m_gset.gif \ No newline at end of file diff --git a/graphics/m_horsen.gif b/graphics/m_horsen.gif new file mode 120000 index 00000000..cafeb82e --- /dev/null +++ b/graphics/m_horsen.gif @@ -0,0 +1 @@ +text/m_horsen.gif \ No newline at end of file diff --git a/graphics/m_hud.gif b/graphics/m_hud.gif new file mode 120000 index 00000000..6454aff6 --- /dev/null +++ b/graphics/m_hud.gif @@ -0,0 +1 @@ +text/m_hud.gif \ No newline at end of file diff --git a/graphics/m_joyset.gif b/graphics/m_joyset.gif new file mode 120000 index 00000000..51c1ed7b --- /dev/null +++ b/graphics/m_joyset.gif @@ -0,0 +1 @@ +text/m_joyset.gif \ No newline at end of file diff --git a/graphics/m_keybnd.gif b/graphics/m_keybnd.gif new file mode 120000 index 00000000..91a0daf9 --- /dev/null +++ b/graphics/m_keybnd.gif @@ -0,0 +1 @@ +text/m_keybnd.gif \ No newline at end of file diff --git a/graphics/m_ldsv.gif b/graphics/m_ldsv.gif new file mode 120000 index 00000000..8c6acdaa --- /dev/null +++ b/graphics/m_ldsv.gif @@ -0,0 +1 @@ +text/m_ldsv.gif \ No newline at end of file diff --git a/graphics/m_loksen.gif b/graphics/m_loksen.gif new file mode 120000 index 00000000..3aba13cd --- /dev/null +++ b/graphics/m_loksen.gif @@ -0,0 +1 @@ +text/m_loksen.gif \ No newline at end of file diff --git a/graphics/m_menus.gif b/graphics/m_menus.gif new file mode 120000 index 00000000..784f6554 --- /dev/null +++ b/graphics/m_menus.gif @@ -0,0 +1 @@ +text/m_menus.gif \ No newline at end of file diff --git a/graphics/m_mess.gif b/graphics/m_mess.gif new file mode 120000 index 00000000..9fdd7152 --- /dev/null +++ b/graphics/m_mess.gif @@ -0,0 +1 @@ +text/m_mess.gif \ No newline at end of file diff --git a/graphics/m_mouse.gif b/graphics/m_mouse.gif new file mode 120000 index 00000000..f69ee1af --- /dev/null +++ b/graphics/m_mouse.gif @@ -0,0 +1 @@ +text/m_mouse.gif \ No newline at end of file diff --git a/graphics/m_multi.gif b/graphics/m_multi.gif new file mode 120000 index 00000000..d375180b --- /dev/null +++ b/graphics/m_multi.gif @@ -0,0 +1 @@ +text/m_multi.gif \ No newline at end of file diff --git a/graphics/m_player.gif b/graphics/m_player.gif new file mode 120000 index 00000000..4e0a49fb --- /dev/null +++ b/graphics/m_player.gif @@ -0,0 +1 @@ +text/m_player.gif \ No newline at end of file diff --git a/graphics/m_serial.gif b/graphics/m_serial.gif new file mode 120000 index 00000000..ec5e455b --- /dev/null +++ b/graphics/m_serial.gif @@ -0,0 +1 @@ +text/m_serial.gif \ No newline at end of file diff --git a/graphics/m_setup.gif b/graphics/m_setup.gif new file mode 120000 index 00000000..9cc4816e --- /dev/null +++ b/graphics/m_setup.gif @@ -0,0 +1 @@ +text/m_setup.gif \ No newline at end of file diff --git a/graphics/m_sound.gif b/graphics/m_sound.gif new file mode 120000 index 00000000..0afe7ce8 --- /dev/null +++ b/graphics/m_sound.gif @@ -0,0 +1 @@ +text/m_sound.gif \ No newline at end of file diff --git a/graphics/m_stat.gif b/graphics/m_stat.gif new file mode 120000 index 00000000..b7a8816c --- /dev/null +++ b/graphics/m_stat.gif @@ -0,0 +1 @@ +text/m_stat.gif \ No newline at end of file diff --git a/graphics/m_status.gif b/graphics/m_status.gif new file mode 120000 index 00000000..90847184 --- /dev/null +++ b/graphics/m_status.gif @@ -0,0 +1 @@ +text/m_status.gif \ No newline at end of file diff --git a/graphics/m_tcpip.gif b/graphics/m_tcpip.gif new file mode 120000 index 00000000..c55f16e1 --- /dev/null +++ b/graphics/m_tcpip.gif @@ -0,0 +1 @@ +text/m_tcpip.gif \ No newline at end of file diff --git a/graphics/m_versen.gif b/graphics/m_versen.gif new file mode 120000 index 00000000..9a5286ae --- /dev/null +++ b/graphics/m_versen.gif @@ -0,0 +1 @@ +text/m_versen.gif \ No newline at end of file diff --git a/graphics/m_video.gif b/graphics/m_video.gif new file mode 120000 index 00000000..3f5351ce --- /dev/null +++ b/graphics/m_video.gif @@ -0,0 +1 @@ +text/m_video.gif \ No newline at end of file diff --git a/graphics/m_wad.gif b/graphics/m_wad.gif new file mode 120000 index 00000000..f044e9c7 --- /dev/null +++ b/graphics/m_wad.gif @@ -0,0 +1 @@ +text/m_wad.gif \ No newline at end of file diff --git a/graphics/m_wadopt.gif b/graphics/m_wadopt.gif new file mode 120000 index 00000000..f6e24a09 --- /dev/null +++ b/graphics/m_wadopt.gif @@ -0,0 +1 @@ +text/m_wadopt.gif \ No newline at end of file diff --git a/graphics/m_weap.gif b/graphics/m_weap.gif new file mode 120000 index 00000000..ef6ecf79 --- /dev/null +++ b/graphics/m_weap.gif @@ -0,0 +1 @@ +text/m_weap.gif \ No newline at end of file diff --git a/graphics/prboom.gif b/graphics/prboom.gif new file mode 120000 index 00000000..63ad6e64 --- /dev/null +++ b/graphics/prboom.gif @@ -0,0 +1 @@ +text/prboom.gif \ No newline at end of file diff --git a/graphics/text/config.py b/graphics/text/config.py index 0b13792a..a9c8f0b1 100644 --- a/graphics/text/config.py +++ b/graphics/text/config.py @@ -113,5 +113,47 @@ red_graphics = { 'wienter': 'ENTERING', 'm_pause': 'pause', + + # Extra graphics used in PrBoom's menus. Generate these as well + # so that when we play in PrBoom the menus look consistent. + 'prboom': 'PrBoom', + 'm_generl': 'General', + 'm_setup': 'Setup', + 'm_keybnd': 'Key Bindings', + 'm_weap': 'Weapons', + 'm_stat': 'Status Bar - HUD', + 'm_auto': 'Automap', + 'm_enem': 'Enemies', + 'm_mess': 'Messages', + 'm_chat': 'Chat Strings', + + 'm_horsen': 'horizontal', + 'm_versen': 'vertical', + 'm_loksen': 'mouse look', + 'm_accel': 'acceleration', + + # Extra graphics from SMMU/Eternity Engine: + 'm_about': 'about', + 'm_chatm': 'Chat Strings', + 'm_compat': 'Compatibility', + 'm_demos': 'demos', + 'm_dmflag': 'deathmatch flags', + 'm_etcopt': 'eternity options', + 'm_feat': 'Features', + 'm_gset': 'game settings', + 'm_hud': 'heads up display', + 'm_joyset': 'joysticks', + 'm_ldsv': 'Load and Save', # TODO: Font needs a / character + 'm_menus': 'Menu Options', + 'm_mouse': 'mouse options', + 'm_multi': 'multiplayer', + 'm_player': 'player setup', + 'm_serial': 'serial connection', + 'm_sound': 'sound options', + 'm_status': 'status bar', + 'm_tcpip': 'tcp/ip connection', + 'm_video': 'video options', + 'm_wad': 'load wad', + 'm_wadopt': 'wad options', }