OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix punch use achievement double increment.

Browse source 
Fix division by zero.
This commit is contained in:
Mari the Deer 2021-03-26 08:08:26 +01:00
commit 41b592f19c
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
zscript/hud/swwm_hudextra.zsc
View file

@ -202,6 +202,7 @@ Class SWWMAchievementNotification : HUDMessageBase
Vector2 hs;
if ( swwm_hudscale <= 0 ) hs = StatusBar.GetHUDScale();
else hs.x = swwm_hudscale;
hs.y = hs.x;
Vector2 ss = (Screen.GetWidth()/hs.x,Screen.GetHeight()/hs.y);
double alpha = (tics<fadeintics)?(tics/fadeintics):(tics<(fadeintics+holdtics))?1.:(1.-(tics-(fadeintics+holdtics))/fadeouttics);
Vector2 pos = (int(ss.x-256)/2,(ss.y-(margin+36))+int(margin+40)*(1.-alpha));

3
zscript/weapons/swwm_baseweapon_melee.zsc
View file

@ -391,10 +391,7 @@ extend Class SWWMWeapon
{
int locknum = SWWMUtility.GetLineLock(ut.uses[i].hitline);
if ( !locknum || CheckKeys(locknum,false,true) )
{
SWWMUtility.AchievementProgressInc('swwm_progress_slemg',1,player);
ut.uses[i].hitline.RemoteActivate(self,ut.uses[i].hitside,SPAC_Use,ut.uses[i].pos);
}
if ( !(ut.uses[i].hitline.activation&SPAC_UseThrough) ) break;
}
}