From c60336b95085fde825a8beb84c71ff34009a2082 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Mon, 11 Jun 2018 19:38:58 +0200 Subject: [PATCH] hotfix: sniper rifle zoom and guided redeemer should hide crosshair. --- zscript/sniperrifle.zsc | 7 +++++++ zscript/warheadlauncher.zsc | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/zscript/sniperrifle.zsc b/zscript/sniperrifle.zsc index e7769bb..64345c9 100644 --- a/zscript/sniperrifle.zsc +++ b/zscript/sniperrifle.zsc @@ -59,6 +59,13 @@ Class SniperRifle : UTWeapon Screen.DrawTexture(reticle,false,320,240,DTA_VirtualWidth,640,DTA_VirtualHeight,480,DTA_RenderStyle,(1|2<<8|1<<16)); Screen.DrawText(confont,Font.CR_DARKGREEN,192,160,String.Format("X%.1f",sniperzoom),DTA_Clean,true); } + override void Tick() + { + Super.Tick(); + if ( !Owner ) return; + if ( sniperzoom > 1.0 ) crosshair = 99; + else crosshair = 0; + } action void A_SniperFire( bool zoomed = false ) { Weapon weap = Weapon(invoker); diff --git a/zscript/warheadlauncher.zsc b/zscript/warheadlauncher.zsc index 14fa0aa..f86bdbc 100644 --- a/zscript/warheadlauncher.zsc +++ b/zscript/warheadlauncher.zsc @@ -560,6 +560,13 @@ Class RedeemerHUDHandler : EventHandler Class WarheadLauncher : UTWeapon replaces BFG9000 { Actor guided; + override void Tick() + { + Super.Tick(); + if ( !Owner ) return; + if ( guided ) crosshair = 99; + else crosshair = 0; + } action void A_WarheadFire() { Weapon weap = Weapon(invoker);