OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Hide voicepack selector if only one voice is available.

Browse source 
Alternate back button.
This commit is contained in:
Mari the Deer 2020-11-17 13:11:44 +01:00
commit ff8101f30e
4 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
graphics/swwmback.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 244 B

Before After
Before After

2
language.version
View file

@ -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)";

14
zscript/swwm_menus.zsc
View file

@ -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();

6
zscript/swwm_player.zsc
View file

@ -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;
}
}