From 85549628fd108e25311466fcdb467834425bd3da Mon Sep 17 00:00:00 2001 From: Mike Swanson Date: Sun, 8 Sep 2019 00:39:55 -0700 Subject: [PATCH] =?UTF-8?q?textures:=20redefine=20A-BROWN4=20so=20it=20doe?= =?UTF-8?q?sn=E2=80=99t=20use=20BOSFA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With WAD merging with certain Doom 2 mods (eg, doom2/Ports/megawads/strg), using a sprite in this texture causes some engines to crash on loading the game. The mod makes up its new BOSF* sprites but omits BOSFA0, which caused our game to crash when trying to load Freedoom with Struggle. This can break Plutonia mod compatibility a bit if they try to replace this sprite too, but let’s hope that will not happen. --- lumps/textures/textures.cfg | 26 +++++++++++++------------- patches/skulface.png | Bin 0 -> 1704 bytes 2 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 patches/skulface.png diff --git a/lumps/textures/textures.cfg b/lumps/textures/textures.cfg index 885956ef..b432cff0 100644 --- a/lumps/textures/textures.cfg +++ b/lumps/textures/textures.cfg @@ -251,13 +251,13 @@ TEKWALL5 128 128 * WALL24_1 -120 -8 ; tnt texture support -; may conflict, not yet added - SW1GSTON 512 128 -; may conflict, not yet added - SW2GSTON 512 128 -; may conflict, not yet added - BLODGR1 512 128 -; may conflict, not yet added - SW1SKULL 512 128 -; may conflict, not yet added - BLODGR4 512 128 -; may conflict, not yet added - SLADRIP1 512 128 -; may conflict, not yet added - SLADRIP3 512 128 +; conflicts, not added - SW1GSTON 512 128 +; conflicts, not added - SW2GSTON 512 128 +; conflicts, not added - BLODGR1 512 128 +; conflicts, not added - SW1SKULL 512 128 +; conflicts, not added - BLODGR4 512 128 +; conflicts, not added - SLADRIP1 512 128 +; conflicts, not added - SLADRIP3 512 128 ALTAQUA 128 128 * ALTAQUA 0 0 @@ -861,20 +861,20 @@ A-BRICK3 128 128 A-BROCK2 128 128 * BROCK2 0 0 A-BROWN1 128 128 -* BROWN1 0 0 +* BROWN1 0 0 A-BROWN2 128 128 -* BROWN2 0 0 +* BROWN2 0 0 A-BROWN3 128 128 -* BROWN3 0 0 +* BROWN3 0 0 A-BROWN4 128 128 -* BROWN1 0 0 +* BROWN1 0 0 * W111_2 0 0 * W111_3 64 64 * W111_2 0 64 * W111_3 64 0 -* BOSFA0 40 35 +* SKULFACE 40 35 ; original was BOSFA0, can break doom2 mod compat A-BROWN5 128 128 -* BROWN5 0 0 +* BROWN5 0 0 A-DBRI1 128 128 * DIRBRI1 0 0 A-DBRI2 128 128 diff --git a/patches/skulface.png b/patches/skulface.png new file mode 100644 index 0000000000000000000000000000000000000000..0c5fab77f9eabd9c12a5f4a90d59af902a844919 GIT binary patch literal 1704 zcmV;Z23PrsP)qu00004XF*Lt006O% z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00024 zP)t-s0RR7I004gg0J8u9n*ab?2M1380LuUX;{X6hGb1-66CW1~pNDU+mw%IcW2cXI zgKJk`OE)ts6H`Agx1Wcbe`||#TW3>0dt*;?000XM3wK{jQwIkC01HDe8!s;}H#av+ zOG`sTLsvsH2L}f)Hy=X)0B=`AKPww!V`FP;YeO>|DgL=400inuL_t(Y$CZ|Wa^g4)h9N*&$q*t8b_jQ{TW1sR zVaFyVx9$7C*eTHN?d`Q4>KO<#_Q(HAmK={pZ;x>@9(`tvlgTuhrMCmgUX>vDTWXn9GyCfY6gpYugM8QC|UT>D0xf&3Ga`h3Qg-9paVw3YI z3PsbcDE0fuO41;aEfo;}5YdkQNdH877ujnl1p_%8zI=Un_;LW5n{icw-oFieGb~Xz z%iKPE{r=bYuZ&pAOQGR-bmyoDUNHcWV~o`N$&AmK^`uu+EI)iN{MzUmx z8{K3(JFAQ6y#XNsEl?dGx)Bg0V?7YkNvgal>RDo&e3LgeVZ!*z#1~?mphP~R?6{^L zY%j$?aLLuP8Z>F(r=`fmpkZxq>T!!hvigRM={XKzOyzk8b;0$-o;Bwzu6!9Uu6kpL z`pb53r8`8oj~riHi52gs;o?W&XIzQOffdm@!Ho|cUJ)m}$3V^)$4GD%A~gK5E{Muo zULFH_FWmlGy#CBYu%UNgtgEWv1(-%PY~P29CAb=Uo@e6xQtn+4+~z_$JYIYS5xEZw ziXsG-I39(Q0x_WIUi%}U#lS>~hHO=FdvZDQ&tOGm%^pi8!hpOIBfK~Uti)ati&%C= z?23VwBs)X6M2G*rH4M1mkxyM`C5r@TilX2%iuELCsRZO8c-2pWkMbaXI1al;8(9Pz zm8k|;BHB<_Jo7{F2GLImR_6SQL8QjL<7f>>Zmh4|9@9Z$m>!D!H4M(2_xvw=Td}Xf z*4`MiA55{Q%I?_#ui%9KJbo^t6ro?0De_-eK7=qlEY{_!52Cy-`R~!|%fZ)52z0|* zKYTe9LJXct|JM7XEKA;}6$d{c)dg^Mi70sHo!1&8ys=_P+MwY%2*F$X?)ocI`&4i} z-c4s!>%^7=66HrPbVfv)ifa3Gm&{sGr=k8B7#LA+Q$J;5D!2)SxZzsDeV!&yPur)O z`~0?>%CVl;Z5Os2E# zXKsr1^W=H^nS0`Bw4FSE4j4qz`cnk&$>$^n05UK!H!UzSEiy4wF*rIjIXW~sEigDbFff?EjGzDj03~!qSaf7zbY(hi yZ)9m^c>ppnF*hwRGA%MOR53U@G&wpnIV~_aIxsNl;xrrp0000