From eb7f1b87e59e3490862c1ea7e5866095cb74ea9e Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 4 Jan 2017 12:47:49 -0500 Subject: [PATCH 1/4] - Added Wadsmoosh detection. --- wadsrc/static/iwadinfo.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/wadsrc/static/iwadinfo.txt b/wadsrc/static/iwadinfo.txt index d0fb1a157..2376a89f5 100644 --- a/wadsrc/static/iwadinfo.txt +++ b/wadsrc/static/iwadinfo.txt @@ -1,5 +1,17 @@ // Must be sorted in identification order (easiest to recognize first!) +IWad +{ + Name = "DOOM: Wadsmoosh" + Autoname = "doom.doom2.wadsmoosh" + Game = "Doom" + Config = "Doom" + Mapinfo = "mapinfo/doom2.txt" + Compatibility = "Shorttex" + MustContain = "MAP01", "WADSMUSH" + BannerColors = "a8 00 00", "a8 a8 a8" +} + IWad { Name = "Delaweare" @@ -369,6 +381,7 @@ IWad Names { + "doom_complete.pk3" "bfgdoom2.wad" "doom2bfg.wad" "doom2f.wad" From 4fe3f7611c0d1dfd563ac8fa4672e730b1a48dbb Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 4 Jan 2017 12:55:19 -0500 Subject: [PATCH 2/4] - Made WadSmoosh detection more flexible (since it doesn't necessarily require MAP01 to be present). --- wadsrc/static/iwadinfo.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wadsrc/static/iwadinfo.txt b/wadsrc/static/iwadinfo.txt index 2376a89f5..bb1c0fbb4 100644 --- a/wadsrc/static/iwadinfo.txt +++ b/wadsrc/static/iwadinfo.txt @@ -2,13 +2,13 @@ IWad { - Name = "DOOM: Wadsmoosh" + Name = "DOOM: Complete: WadSmoosh" Autoname = "doom.doom2.wadsmoosh" Game = "Doom" Config = "Doom" Mapinfo = "mapinfo/doom2.txt" Compatibility = "Shorttex" - MustContain = "MAP01", "WADSMUSH" + MustContain = "WADSMUSH" BannerColors = "a8 00 00", "a8 a8 a8" } From 8651cbc75a669aafdb42b9301431c4aef53a77f4 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 4 Jan 2017 13:01:17 -0500 Subject: [PATCH 3/4] - Wildweasel pointed out that WadSmoosh generates a "SMOOSHED" lump. http://forum.zdoom.org/viewtopic.php?p=967226#p967226 --- wadsrc/static/iwadinfo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wadsrc/static/iwadinfo.txt b/wadsrc/static/iwadinfo.txt index bb1c0fbb4..0340da6fd 100644 --- a/wadsrc/static/iwadinfo.txt +++ b/wadsrc/static/iwadinfo.txt @@ -8,7 +8,7 @@ IWad Config = "Doom" Mapinfo = "mapinfo/doom2.txt" Compatibility = "Shorttex" - MustContain = "WADSMUSH" + MustContain = "SMOOSHED" BannerColors = "a8 00 00", "a8 a8 a8" } From 0a581754bf1ab213b6a2a05db63e2ab3ac4c19a6 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Wed, 4 Jan 2017 13:47:31 -0500 Subject: [PATCH 4/4] - Made WadSmoosh detection a lot stricter. --- wadsrc/static/iwadinfo.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/wadsrc/static/iwadinfo.txt b/wadsrc/static/iwadinfo.txt index 0340da6fd..6746c6248 100644 --- a/wadsrc/static/iwadinfo.txt +++ b/wadsrc/static/iwadinfo.txt @@ -1,17 +1,5 @@ // Must be sorted in identification order (easiest to recognize first!) -IWad -{ - Name = "DOOM: Complete: WadSmoosh" - Autoname = "doom.doom2.wadsmoosh" - Game = "Doom" - Config = "Doom" - Mapinfo = "mapinfo/doom2.txt" - Compatibility = "Shorttex" - MustContain = "SMOOSHED" - BannerColors = "a8 00 00", "a8 a8 a8" -} - IWad { Name = "Delaweare" @@ -288,6 +276,18 @@ IWad BannerColors = "54 54 54", "a8 a8 a8" } +IWad +{ + Name = "DOOM: Complete: WadSmoosh" + Autoname = "doom.doom2.wadsmoosh" + Game = "Doom" + Config = "Doom" + Mapinfo = "mapinfo/doom2.txt" + Compatibility = "Shorttex" + MustContain = "SMOOSHED", "ANIMDEFS", "LANGUAGE", "MAPINFO", "ENDOOM", "M_DOOM", "TITLEPIC", "TEXTURES" + BannerColors = "a8 00 00", "a8 a8 a8" +} + IWad { Name = "The Ultimate DOOM"