From 917c251f037f99d86b310e8538b23b68a8d606c6 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Mon, 17 May 2021 14:59:35 +0200
Subject: [PATCH] Patch up some code for 4.6 compatibility.

---
 language.version              | 4 ++--
 zscript/hud/swwm_hud.zsc      | 2 +-
 zscript/hud/swwm_hudextra.zsc | 3 ++-
 zscript/menu/swwm_menus.zsc   | 4 ++--
 zscript/swwm_player.zsc       | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/language.version b/language.version
index 5715b9565..9cbf1d0ef 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r489 \cu(Sun 16 May 14:17:06 CEST 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r489 \cu(2021-05-16 14:17:06)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r490 \cu(Mon 17 May 14:59:35 CEST 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r490 \cu(2021-05-17 14:59:35)\c-";
diff --git a/zscript/hud/swwm_hud.zsc b/zscript/hud/swwm_hud.zsc
index 351bf4ab6..04fc22cb3 100644
--- a/zscript/hud/swwm_hud.zsc
+++ b/zscript/hud/swwm_hud.zsc
@@ -1930,7 +1930,7 @@ Class SWWMStatusBar : BaseStatusBar
 		yy = margin;
 		bool smol = (ss.x<640);
 		Screen.DrawTexture(ChatTex[smol?3:0],false,xx,yy,DTA_VirtualWidthF,ss.x,DTA_VirtualHeightF,ss.y,DTA_KeepRatio,true,DTA_Alpha,boxalph);
-		yy++;
+		yy += 1;
 		for ( int i=mstart; i<MainQueue.Size(); i++ )
 		{
 			int col = msg2color;
diff --git a/zscript/hud/swwm_hudextra.zsc b/zscript/hud/swwm_hudextra.zsc
index 1cb05ceab..f9a8e6299 100644
--- a/zscript/hud/swwm_hudextra.zsc
+++ b/zscript/hud/swwm_hudextra.zsc
@@ -163,7 +163,8 @@ Class SWWMAchievementNotification : HUDMessageBase
 	String tag, txt;
 	int num;
 	TextureID icon, frame;
-	double tics, holdtics, fadeintics, fadeouttics;
+	int tics;
+	double holdtics, fadeintics, fadeouttics;
 	transient Font tewifont, mplusfont, miniwifont, k6x8font;
 
 	SWWMAchievementNotification Init( String bname, TextureID icon, int bnum = 0 )
diff --git a/zscript/menu/swwm_menus.zsc b/zscript/menu/swwm_menus.zsc
index e6b985352..33f4576b2 100644
--- a/zscript/menu/swwm_menus.zsc
+++ b/zscript/menu/swwm_menus.zsc
@@ -853,12 +853,12 @@ Class OptionMenuItemScaleSliderFix : OptionMenuItemScaleSlider
 		double value = GetSliderValue();
 		if ( mkey == Menu.MKEY_Left )
 		{
-			if ( value <= 0 ) value--;
+			if ( value <= 0 ) value = -1;
 			else value = max(0,value-mStep);
 		}
 		else if ( mkey == Menu.MKEY_Right )
 		{
-			if ( value < 0 ) value++;
+			if ( value < 0 ) value = 0;
 			else value += mStep;
 		}
 		else return OptionMenuItem.MenuEvent(mkey,fromcontroller);
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index d4194f825..706eaec0e 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -1494,7 +1494,7 @@ Class Demolitionist : PlayerPawn
 			player.onground = false;
 			if ( player.turnticks )
 			{
-				player.turnticks--;
+				player.turnticks -= 1;
 				guideangle = (180./TURN180_TICKS);
 			}
 			else guideangle += .2*player.cmd.yaw*(360./65536.);