diff --git a/language.version b/language.version index b33ca7bf6..cb8c4547c 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.1.45 \cu(Sun 13 Feb 15:55:52 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.1.45 \cu(2022-02-13 15:55:52)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.1.46 \cu(Mon 14 Feb 01:27:36 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.1.46 \cu(2022-02-14 01:27:36)\c-"; diff --git a/zscript/handler/swwm_handler_cheats.zsc b/zscript/handler/swwm_handler_cheats.zsc index 80b5256b0..338dd3d3c 100644 --- a/zscript/handler/swwm_handler_cheats.zsc +++ b/zscript/handler/swwm_handler_cheats.zsc @@ -400,7 +400,7 @@ extend Class SWWMHandler private ui bool CheatInput( InputEvent e ) { // cheat code handling - String cht[] = + static const String cht[] = { "swwmlodsofemone", "swwmdeeplore", "swwmfroggygang", "swwmforgetaboutit", "swwmmisterproper", "swwmstinky", @@ -413,7 +413,7 @@ extend Class SWWMHandler "swwmmarioisaweenie", "swwmpunish", "swwmboingball", "swwmgassy", "swwmiamsuperman", "swwmtouchstone" }; - String cmd[] = + static const String cmd[] = { "swwmmoneycheat", "swwmlorecheat", "swwmfroggycheat", "swwmamnesiacheat", "swwmjanitorcheat", "swwmsewercountcheat", diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc index 470ee615f..46b1474ea 100644 --- a/zscript/utility/swwm_utility.zsc +++ b/zscript/utility/swwm_utility.zsc @@ -636,17 +636,17 @@ Class SWWMUtility q = (maxclip.y-v0.y); break; } - if ( (p == 0.) && (q<0.) ) return false; + if ( (p == 0.) && (q<0.) ) return false, (0,0), (0,0); if ( p < 0 ) { r = q/p; - if ( r > t1 ) return false; + if ( r > t1 ) return false, (0,0), (0,0); else if ( r > t0 ) t0 = r; } else if ( p > 0 ) { r = q/p; - if ( r < t0 ) return false; + if ( r < t0 ) return false, (0,0), (0,0); else if ( r < t1 ) t1 = r; } }