From bdd1116d6b8a4def7372c7334feb47643abcf4eb Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sun, 13 Sep 2020 10:14:01 +0200 Subject: [PATCH] Fixed: Silver Bullet scope was not affected by Use Shaders setting. --- language.version | 2 +- zscript/swwm_thiccboolet.zsc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/language.version b/language.version index 1f0ca0f6b..bb64f77a3 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\chSWWM \cwGZ\c- r541 (Sat 12 Sep 19:02:25 CEST 2020)"; +SWWM_MODVER="\chSWWM \cwGZ\c- r542 (Sun 13 Sep 10:14:01 CEST 2020)"; diff --git a/zscript/swwm_thiccboolet.zsc b/zscript/swwm_thiccboolet.zsc index 0eaaefced..a1241094a 100644 --- a/zscript/swwm_thiccboolet.zsc +++ b/zscript/swwm_thiccboolet.zsc @@ -559,6 +559,7 @@ Class SilverBullet : SWWMWeapon bool zoomed; double zoomlevel; ui TextureID reticle; + transient ui CVar useshaders; bool initialized; int rezoom; bool proneme; @@ -685,7 +686,8 @@ Class SilverBullet : SWWMWeapon } override void RenderUnderlay( RenderEvent e ) { - if ( zoomed && (Owner.player == players[consoleplayer]) ) + if ( !useshaders ) useshaders = CVar.GetCVar('swwm_shaders',players[consoleplayer]); + if ( zoomed && (Owner.player == players[consoleplayer]) && useshaders.GetBool() ) { Vector2 ss = (Screen.GetWidth(),Screen.GetHeight()); ss *= (512./ss.y);