From 092f9cfd7f40749823fad97b310e376fd8395b7b Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Fri, 25 Jun 2021 17:48:50 +0200 Subject: [PATCH] Fix marble face textures in D2INO not being graffiti-able. --- language.version | 4 ++-- zscript/utility/swwm_utility.zsc | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/language.version b/language.version index 26d1aad16..ec9b4f4c2 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r556 \cu(Thu 24 Jun 21:53:38 CEST 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r556 \cu(2021-06-24 21:53:38)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r557 \cu(Fri 25 Jun 17:48:51 CEST 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r557 \cu(2021-06-25 17:48:51)\c-"; diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc index f48306609..0cd09542b 100644 --- a/zscript/utility/swwm_utility.zsc +++ b/zscript/utility/swwm_utility.zsc @@ -1859,13 +1859,14 @@ Class SWWMUtility static bool, TextureID DefaceTexture( TextureID checkme ) { String tn = TexMan.GetName(checkme); - if ( (tn ~== "MARBFAC2") ) + // special case: alt texture names in Doom 2 In Spain Only + if ( (tn ~== "MARBFAC2") || (tn ~== "SP_MAR01") ) return true, TexMan.CheckForTexture("defaced_MARBFAC2",TexMan.Type_Any); - if ( (tn ~== "MARBFAC3") ) + if ( (tn ~== "MARBFAC3") || (tn ~== "SP_MAR02")) return true, TexMan.CheckForTexture("defaced_MARBFAC3",TexMan.Type_Any); - if ( (tn ~== "MARBFAC4") ) + if ( (tn ~== "MARBFAC4") || (tn ~== "SP_MAR03") ) return true, TexMan.CheckForTexture("defaced_MARBFAC4",TexMan.Type_Any); - if ( (tn ~== "MARBFACE") ) + if ( (tn ~== "MARBFACE") || (tn ~== "SP_MAR04") ) return true, TexMan.CheckForTexture("defaced_MARBFACE",TexMan.Type_Any); if ( (tn ~== "ZZWOLF2") ) return true, TexMan.CheckForTexture("defaced_ZZWOLF2",TexMan.Type_Any);