From ff8101f30e11f3c8d4d8806da52e7c5f52e10389 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Tue, 17 Nov 2020 13:11:44 +0100
Subject: [PATCH] Hide voicepack selector if only one voice is available.
 Alternate back button.

---
 graphics/swwmback.png   | Bin 217 -> 244 bytes
 language.version        |   2 +-
 zscript/swwm_menus.zsc  |  14 ++++++++++++++
 zscript/swwm_player.zsc |   6 +++---
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/graphics/swwmback.png b/graphics/swwmback.png
index 3daccae0339a189e960eb5bc5ba1ab5929a31469..5735387688cc5496a7fc33781a06e2b151f65d5a 100644
GIT binary patch
literal 244
zcmeAS@N?(olHy`uVBq!ia0y~yV31^BU=ZP8W?*3OUzyg=z`$S`;1lA?z`!6N;2<WJ
zCMP#ZUVgfQ!dwM~MT&|ml$6#gD{od&*{Q0!PfhKJy80;%jq{qCSGBZmX=^{w(RtR_
zo&A7;fq}6k$S;_|;n|He1_p*qPZ!4!3CY}po<fHV1XvEPJCqim^6!7dlZNgKDbL(h
zMQgcdzTCz+Gb7vggnex(pU3j^ofBRptGT>qRlKL=v?r|P#Zm>8s(GB8RkJueFC;%_
zxU}%~u2UM;C6Or;^uH)9Y2aG9!JG5M1Lkfk4!NcK?Vd9*Ffe$!`njxgN@xNAFUM3L

literal 217
zcmeAS@N?(olHy`uVBq!ia0vp@3=9l>EX)iH3~Yhj4;dI3)B}7%Tp1V`1Oyz!#M0#C
zrYb1RRa9K6q_kE=Wt*z%J~g#t8XD&`HLq)H-)~wxe>DRG17k^$UoeBivm0p)3=9dL
zE{-7_vaAO;@-{n&xEwsr#$owOb<WBIb1yQ<?qDr<(sdELxK`Du<(jcm@mYTsd0UN(
zG5HhJ{Nn?nuceww^?&3DlMybNd)=~O&&IuMSKgQH4)~M2yrr5+>F(W*hL7@#rfUT*
Ux&Eu4fq{X+)78&qol`;+012E&-~a#s

diff --git a/language.version b/language.version
index 082b4a57b..c6834f999 100644
--- a/language.version
+++ b/language.version
@@ -1,2 +1,2 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r622 \cu(Tue 17 Nov 11:51:07 CET 2020)";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r623 \cu(Tue 17 Nov 13:11:44 CET 2020)";
diff --git a/zscript/swwm_menus.zsc b/zscript/swwm_menus.zsc
index d0fe7ba2a..8c03c185b 100644
--- a/zscript/swwm_menus.zsc
+++ b/zscript/swwm_menus.zsc
@@ -119,6 +119,20 @@ Class SWWMOptionMenu : OptionMenu
 	transient CVar lang;
 	transient Font TewiFont, MPlusFont;
 
+	override void Init( Menu parent, OptionMenuDescriptor desc )
+	{
+		Super.Init(parent,desc);
+		// remove voicepack selector if there's only one voice
+		for ( int i=0; i<mDesc.mItems.Size(); i++ )
+		{
+			if ( !(mDesc.mItems[i] is 'OptionMenuItemSWWMVoiceOption')
+				|| (OptionMenuItemSWWMVoiceOption(mDesc.mItems[i]).types.Size() > 1) ) continue;
+			mDesc.mItems[i].Destroy();
+			mDesc.mItems.Delete(i);
+			if ( mDesc.mSelectedItem > i ) mDesc.mSelectedItem--;
+			i--;
+		}
+	}
 	override void Ticker()
 	{
 		Super.Ticker();
diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc
index c618aee17..acd58cf2b 100644
--- a/zscript/swwm_player.zsc
+++ b/zscript/swwm_player.zsc
@@ -1172,17 +1172,17 @@ Class Demolitionist : PlayerPawn
 			bool crossgap = false;
 			for ( int i=1; i<=4; i++ )	// test up to 4 steps ahead, should be enough for most cases
 			{
-				SetOrigin(Vec3Offset(vel.x,vel.y,vel.z),false);
+				SetOrigin(Vec3Offset(vel.x,vel.y,vel.z),true);
 				if ( floorz < storepos.z ) continue;
 				crossgap = true;
 				break;
 			}
-			SetOrigin(storepos,false);
+			SetOrigin(storepos,true);
 			floorz = storefloorz;
 			if ( !crossgap )
 			{
 				ssup = max(0,(pos.z-floorz));
-				SetOrigin(Vec2OffsetZ(0,0,floorz),true);
+				SetZ(floorz);
 				lastground = player.onground = true;
 			}
 		}