From b1589b05d93523e80a8722345b8d76da155f2e51 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 8 Jan 2014 04:36:35 +0000 Subject: [PATCH] graphics: Build level name graphics for FreeDM. First stab at fixing #11. Generate DMWILV* lumps containing FreeDM level names, and include these in the IWAD as the CWILV* lumps as appropriate. --- buildcfg.txt | 106 +++++++++++++++++++++++++++------------ graphics/dmwilv00.gif | 1 + graphics/dmwilv01.gif | 1 + graphics/dmwilv02.gif | 1 + graphics/dmwilv03.gif | 1 + graphics/dmwilv04.gif | 1 + graphics/dmwilv05.gif | 1 + graphics/dmwilv06.gif | 1 + graphics/dmwilv07.gif | 1 + graphics/dmwilv08.gif | 1 + graphics/dmwilv09.gif | 1 + graphics/dmwilv10.gif | 1 + graphics/dmwilv11.gif | 1 + graphics/dmwilv12.gif | 1 + graphics/dmwilv13.gif | 1 + graphics/dmwilv14.gif | 1 + graphics/dmwilv15.gif | 1 + graphics/dmwilv16.gif | 1 + graphics/dmwilv17.gif | 1 + graphics/dmwilv18.gif | 1 + graphics/dmwilv19.gif | 1 + graphics/dmwilv20.gif | 1 + graphics/dmwilv21.gif | 1 + graphics/dmwilv22.gif | 1 + graphics/dmwilv23.gif | 1 + graphics/dmwilv24.gif | 1 + graphics/dmwilv25.gif | 1 + graphics/dmwilv26.gif | 1 + graphics/dmwilv27.gif | 1 + graphics/dmwilv28.gif | 1 + graphics/dmwilv29.gif | 1 + graphics/dmwilv30.gif | 1 + graphics/dmwilv31.gif | 1 + graphics/text/.gitignore | 1 + graphics/text/config.py | 13 +++++ 35 files changed, 120 insertions(+), 32 deletions(-) create mode 120000 graphics/dmwilv00.gif create mode 120000 graphics/dmwilv01.gif create mode 120000 graphics/dmwilv02.gif create mode 120000 graphics/dmwilv03.gif create mode 120000 graphics/dmwilv04.gif create mode 120000 graphics/dmwilv05.gif create mode 120000 graphics/dmwilv06.gif create mode 120000 graphics/dmwilv07.gif create mode 120000 graphics/dmwilv08.gif create mode 120000 graphics/dmwilv09.gif create mode 120000 graphics/dmwilv10.gif create mode 120000 graphics/dmwilv11.gif create mode 120000 graphics/dmwilv12.gif create mode 120000 graphics/dmwilv13.gif create mode 120000 graphics/dmwilv14.gif create mode 120000 graphics/dmwilv15.gif create mode 120000 graphics/dmwilv16.gif create mode 120000 graphics/dmwilv17.gif create mode 120000 graphics/dmwilv18.gif create mode 120000 graphics/dmwilv19.gif create mode 120000 graphics/dmwilv20.gif create mode 120000 graphics/dmwilv21.gif create mode 120000 graphics/dmwilv22.gif create mode 120000 graphics/dmwilv23.gif create mode 120000 graphics/dmwilv24.gif create mode 120000 graphics/dmwilv25.gif create mode 120000 graphics/dmwilv26.gif create mode 120000 graphics/dmwilv27.gif create mode 120000 graphics/dmwilv28.gif create mode 120000 graphics/dmwilv29.gif create mode 120000 graphics/dmwilv30.gif create mode 120000 graphics/dmwilv31.gif diff --git a/buildcfg.txt b/buildcfg.txt index ad82ebbf..393e53b2 100644 --- a/buildcfg.txt +++ b/buildcfg.txt @@ -962,38 +962,80 @@ WIA20502 0 0 #else /* #ifndef DOOM2 */ -CWILV00 0 0 -CWILV01 0 0 -CWILV02 0 0 -CWILV03 0 0 -CWILV04 0 0 -CWILV05 0 0 -CWILV06 0 0 -CWILV07 0 0 -CWILV08 0 0 -CWILV09 0 0 -CWILV10 0 0 -CWILV11 0 0 -CWILV12 0 0 -CWILV13 0 0 -CWILV14 0 0 -CWILV15 0 0 -CWILV16 0 0 -CWILV17 0 0 -CWILV18 0 0 -CWILV19 0 0 -CWILV22 0 0 -CWILV21 0 0 -CWILV20 0 0 -CWILV23 0 0 -CWILV25 0 0 -CWILV26 0 0 -CWILV27 0 0 -CWILV28 0 0 -CWILV29 0 0 -CWILV24 0 0 -CWILV30 0 0 -CWILV31 0 0 +#ifndef FREEDM + +CWILV00 +CWILV01 +CWILV02 +CWILV03 +CWILV04 +CWILV05 +CWILV06 +CWILV07 +CWILV08 +CWILV09 +CWILV10 +CWILV11 +CWILV12 +CWILV13 +CWILV14 +CWILV15 +CWILV16 +CWILV17 +CWILV18 +CWILV19 +CWILV22 +CWILV21 +CWILV20 +CWILV23 +CWILV25 +CWILV26 +CWILV27 +CWILV28 +CWILV29 +CWILV24 +CWILV30 +CWILV31 + +#else /* #ifdef FREEDM */ + +; FreeDM has different levels, different level names: + +CWILV00 = DMWILV00 +CWILV01 = DMWILV01 +CWILV02 = DMWILV02 +CWILV03 = DMWILV03 +CWILV04 = DMWILV04 +CWILV05 = DMWILV05 +CWILV06 = DMWILV06 +CWILV07 = DMWILV07 +CWILV08 = DMWILV08 +CWILV09 = DMWILV09 +CWILV10 = DMWILV10 +CWILV11 = DMWILV11 +CWILV12 = DMWILV12 +CWILV13 = DMWILV13 +CWILV14 = DMWILV14 +CWILV15 = DMWILV15 +CWILV16 = DMWILV16 +CWILV17 = DMWILV17 +CWILV18 = DMWILV18 +CWILV19 = DMWILV19 +CWILV22 = DMWILV22 +CWILV21 = DMWILV21 +CWILV20 = DMWILV20 +CWILV23 = DMWILV23 +CWILV25 = DMWILV25 +CWILV26 = DMWILV26 +CWILV27 = DMWILV27 +CWILV28 = DMWILV28 +CWILV29 = DMWILV29 +CWILV24 = DMWILV24 +CWILV30 = DMWILV30 +CWILV31 = DMWILV31 + +#endif + #endif /* #ifdef DOOM2 */ #ifdef ULTDOOM_OR_DOOM2 diff --git a/graphics/dmwilv00.gif b/graphics/dmwilv00.gif new file mode 120000 index 00000000..976d6f52 --- /dev/null +++ b/graphics/dmwilv00.gif @@ -0,0 +1 @@ +text/dmwilv00.gif \ No newline at end of file diff --git a/graphics/dmwilv01.gif b/graphics/dmwilv01.gif new file mode 120000 index 00000000..3cd64916 --- /dev/null +++ b/graphics/dmwilv01.gif @@ -0,0 +1 @@ +text/dmwilv01.gif \ No newline at end of file diff --git a/graphics/dmwilv02.gif b/graphics/dmwilv02.gif new file mode 120000 index 00000000..0c1bf255 --- /dev/null +++ b/graphics/dmwilv02.gif @@ -0,0 +1 @@ +text/dmwilv02.gif \ No newline at end of file diff --git a/graphics/dmwilv03.gif b/graphics/dmwilv03.gif new file mode 120000 index 00000000..c39a24a2 --- /dev/null +++ b/graphics/dmwilv03.gif @@ -0,0 +1 @@ +text/dmwilv03.gif \ No newline at end of file diff --git a/graphics/dmwilv04.gif b/graphics/dmwilv04.gif new file mode 120000 index 00000000..b8e5bb44 --- /dev/null +++ b/graphics/dmwilv04.gif @@ -0,0 +1 @@ +text/dmwilv04.gif \ No newline at end of file diff --git a/graphics/dmwilv05.gif b/graphics/dmwilv05.gif new file mode 120000 index 00000000..e2fffa95 --- /dev/null +++ b/graphics/dmwilv05.gif @@ -0,0 +1 @@ +text/dmwilv05.gif \ No newline at end of file diff --git a/graphics/dmwilv06.gif b/graphics/dmwilv06.gif new file mode 120000 index 00000000..8a3713c0 --- /dev/null +++ b/graphics/dmwilv06.gif @@ -0,0 +1 @@ +text/dmwilv06.gif \ No newline at end of file diff --git a/graphics/dmwilv07.gif b/graphics/dmwilv07.gif new file mode 120000 index 00000000..83a4c25d --- /dev/null +++ b/graphics/dmwilv07.gif @@ -0,0 +1 @@ +text/dmwilv07.gif \ No newline at end of file diff --git a/graphics/dmwilv08.gif b/graphics/dmwilv08.gif new file mode 120000 index 00000000..66deaf54 --- /dev/null +++ b/graphics/dmwilv08.gif @@ -0,0 +1 @@ +text/dmwilv08.gif \ No newline at end of file diff --git a/graphics/dmwilv09.gif b/graphics/dmwilv09.gif new file mode 120000 index 00000000..09f49332 --- /dev/null +++ b/graphics/dmwilv09.gif @@ -0,0 +1 @@ +text/dmwilv09.gif \ No newline at end of file diff --git a/graphics/dmwilv10.gif b/graphics/dmwilv10.gif new file mode 120000 index 00000000..bff2a035 --- /dev/null +++ b/graphics/dmwilv10.gif @@ -0,0 +1 @@ +text/dmwilv10.gif \ No newline at end of file diff --git a/graphics/dmwilv11.gif b/graphics/dmwilv11.gif new file mode 120000 index 00000000..96bc0fca --- /dev/null +++ b/graphics/dmwilv11.gif @@ -0,0 +1 @@ +text/dmwilv11.gif \ No newline at end of file diff --git a/graphics/dmwilv12.gif b/graphics/dmwilv12.gif new file mode 120000 index 00000000..aa7f7c34 --- /dev/null +++ b/graphics/dmwilv12.gif @@ -0,0 +1 @@ +text/dmwilv12.gif \ No newline at end of file diff --git a/graphics/dmwilv13.gif b/graphics/dmwilv13.gif new file mode 120000 index 00000000..146f2d9e --- /dev/null +++ b/graphics/dmwilv13.gif @@ -0,0 +1 @@ +text/dmwilv13.gif \ No newline at end of file diff --git a/graphics/dmwilv14.gif b/graphics/dmwilv14.gif new file mode 120000 index 00000000..9564d87d --- /dev/null +++ b/graphics/dmwilv14.gif @@ -0,0 +1 @@ +text/dmwilv14.gif \ No newline at end of file diff --git a/graphics/dmwilv15.gif b/graphics/dmwilv15.gif new file mode 120000 index 00000000..88ecf875 --- /dev/null +++ b/graphics/dmwilv15.gif @@ -0,0 +1 @@ +text/dmwilv15.gif \ No newline at end of file diff --git a/graphics/dmwilv16.gif b/graphics/dmwilv16.gif new file mode 120000 index 00000000..e93d50af --- /dev/null +++ b/graphics/dmwilv16.gif @@ -0,0 +1 @@ +text/dmwilv16.gif \ No newline at end of file diff --git a/graphics/dmwilv17.gif b/graphics/dmwilv17.gif new file mode 120000 index 00000000..457cb24d --- /dev/null +++ b/graphics/dmwilv17.gif @@ -0,0 +1 @@ +text/dmwilv17.gif \ No newline at end of file diff --git a/graphics/dmwilv18.gif b/graphics/dmwilv18.gif new file mode 120000 index 00000000..e5564f4b --- /dev/null +++ b/graphics/dmwilv18.gif @@ -0,0 +1 @@ +text/dmwilv18.gif \ No newline at end of file diff --git a/graphics/dmwilv19.gif b/graphics/dmwilv19.gif new file mode 120000 index 00000000..9951ac9b --- /dev/null +++ b/graphics/dmwilv19.gif @@ -0,0 +1 @@ +text/dmwilv19.gif \ No newline at end of file diff --git a/graphics/dmwilv20.gif b/graphics/dmwilv20.gif new file mode 120000 index 00000000..0b9b1561 --- /dev/null +++ b/graphics/dmwilv20.gif @@ -0,0 +1 @@ +text/dmwilv20.gif \ No newline at end of file diff --git a/graphics/dmwilv21.gif b/graphics/dmwilv21.gif new file mode 120000 index 00000000..463a47b0 --- /dev/null +++ b/graphics/dmwilv21.gif @@ -0,0 +1 @@ +text/dmwilv21.gif \ No newline at end of file diff --git a/graphics/dmwilv22.gif b/graphics/dmwilv22.gif new file mode 120000 index 00000000..7fac8754 --- /dev/null +++ b/graphics/dmwilv22.gif @@ -0,0 +1 @@ +text/dmwilv22.gif \ No newline at end of file diff --git a/graphics/dmwilv23.gif b/graphics/dmwilv23.gif new file mode 120000 index 00000000..88c1df00 --- /dev/null +++ b/graphics/dmwilv23.gif @@ -0,0 +1 @@ +text/dmwilv23.gif \ No newline at end of file diff --git a/graphics/dmwilv24.gif b/graphics/dmwilv24.gif new file mode 120000 index 00000000..7b231487 --- /dev/null +++ b/graphics/dmwilv24.gif @@ -0,0 +1 @@ +text/dmwilv24.gif \ No newline at end of file diff --git a/graphics/dmwilv25.gif b/graphics/dmwilv25.gif new file mode 120000 index 00000000..4482b6ba --- /dev/null +++ b/graphics/dmwilv25.gif @@ -0,0 +1 @@ +text/dmwilv25.gif \ No newline at end of file diff --git a/graphics/dmwilv26.gif b/graphics/dmwilv26.gif new file mode 120000 index 00000000..dcba3b55 --- /dev/null +++ b/graphics/dmwilv26.gif @@ -0,0 +1 @@ +text/dmwilv26.gif \ No newline at end of file diff --git a/graphics/dmwilv27.gif b/graphics/dmwilv27.gif new file mode 120000 index 00000000..abafc771 --- /dev/null +++ b/graphics/dmwilv27.gif @@ -0,0 +1 @@ +text/dmwilv27.gif \ No newline at end of file diff --git a/graphics/dmwilv28.gif b/graphics/dmwilv28.gif new file mode 120000 index 00000000..0d86f595 --- /dev/null +++ b/graphics/dmwilv28.gif @@ -0,0 +1 @@ +text/dmwilv28.gif \ No newline at end of file diff --git a/graphics/dmwilv29.gif b/graphics/dmwilv29.gif new file mode 120000 index 00000000..eb79a38e --- /dev/null +++ b/graphics/dmwilv29.gif @@ -0,0 +1 @@ +text/dmwilv29.gif \ No newline at end of file diff --git a/graphics/dmwilv30.gif b/graphics/dmwilv30.gif new file mode 120000 index 00000000..64706177 --- /dev/null +++ b/graphics/dmwilv30.gif @@ -0,0 +1 @@ +text/dmwilv30.gif \ No newline at end of file diff --git a/graphics/dmwilv31.gif b/graphics/dmwilv31.gif new file mode 120000 index 00000000..7d97bf8a --- /dev/null +++ b/graphics/dmwilv31.gif @@ -0,0 +1 @@ +text/dmwilv31.gif \ No newline at end of file diff --git a/graphics/text/.gitignore b/graphics/text/.gitignore index efea0df4..fa2d4ca8 100644 --- a/graphics/text/.gitignore +++ b/graphics/text/.gitignore @@ -2,4 +2,5 @@ m_*.gif wi*.gif wilv*.gif cwilv*.gif +dmwilv*.gif prboom.gif diff --git a/graphics/text/config.py b/graphics/text/config.py index 1ffb709f..594e6666 100644 --- a/graphics/text/config.py +++ b/graphics/text/config.py @@ -81,6 +81,19 @@ white_graphics = { # Note: level names are also included in this dictionary, with # the data added programatically from the DEHACKED lump, see # code below. + + # TODO: Generate FreeDM level name graphics from DEHACKED lump. + 'dmwilv00': 'DM01', 'dmwilv01': 'DM02', 'dmwilv02': 'DM03', + 'dmwilv03': 'DM04', 'dmwilv04': 'DM05', 'dmwilv05': 'DM06', + 'dmwilv06': 'DM07', 'dmwilv07': 'DM08', 'dmwilv08': 'DM09', + 'dmwilv09': 'DM10', 'dmwilv10': 'DM11', 'dmwilv11': 'DM12', + 'dmwilv12': 'DM13', 'dmwilv13': 'DM14', 'dmwilv14': 'DM15', + 'dmwilv15': 'DM16', 'dmwilv16': 'DM17', 'dmwilv17': 'DM18', + 'dmwilv18': 'DM19', 'dmwilv19': 'DM20', 'dmwilv20': 'DM21', + 'dmwilv21': 'DM22', 'dmwilv22': 'DM23', 'dmwilv23': 'DM24', + 'dmwilv24': 'DM25', 'dmwilv25': 'DM26', 'dmwilv26': 'DM27', + 'dmwilv27': 'DM28', 'dmwilv28': 'DM29', 'dmwilv29': 'DM30', + 'dmwilv30': 'DM31', 'dmwilv31': 'DM32', } blue_graphics = {