Patch up some code for 4.6 compatibility.

This commit is contained in:
Mari the Deer 2021-05-17 14:59:35 +02:00
commit 917c251f03
5 changed files with 8 additions and 7 deletions

View file

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

View file

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

View file

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

View file

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

View file

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