diff --git a/language.version b/language.version index 8585a4581..fbed84c53 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r67 \cu(Wed 1 Dec 01:37:21 CET 2021)\c-"; -SWWM_SHORTVER="\cw1.2pre r67 \cu(2021-12-01 01:37:21)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r68 \cu(Wed 1 Dec 01:55:45 CET 2021)\c-"; +SWWM_SHORTVER="\cw1.2pre r68 \cu(2021-12-01 01:55:45)\c-"; diff --git a/zscript/handler/swwm_handler_process.zsc b/zscript/handler/swwm_handler_process.zsc index 5c590c16d..d856fa84e 100644 --- a/zscript/handler/swwm_handler_process.zsc +++ b/zscript/handler/swwm_handler_process.zsc @@ -18,7 +18,9 @@ extend Class SWWMHandler { if ( (gamestate != GS_LEVEL) || (players[consoleplayer].Health <= 0) || !(players[consoleplayer].mo is 'Demolitionist') ) return; - double val = max(.5,swwm_mm_zoom/2.); + double val = swwm_mm_zoom; + if ( val > 1. ) val = max(1.,val-.5); + else val = max(.5,val-.25); CVar.FindCVar('swwm_mm_zoom').SetFloat(val); } else if ( e.Name ~== "swwmzoomout" ) @@ -26,7 +28,9 @@ extend Class SWWMHandler if ( (gamestate != GS_LEVEL) || (players[consoleplayer].Health <= 0) || !(players[consoleplayer].mo is 'Demolitionist') ) return; double maxval = players[consoleplayer].mo.FindInventory("Omnisight")?2.:1.; - double val = min(maxval,swwm_mm_zoom*2.); + double val = swwm_mm_zoom; + if ( val >= 1. ) val = min(maxval,val+.5); + else val = min(1.,val+.25); CVar.FindCVar('swwm_mm_zoom').SetFloat(val); } }