OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Slight tweak to teleporter handling.

Browse source
This commit is contained in:
Mari the Deer 2021-03-06 14:07:23 +01:00
commit f838e7e23f
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r322 \cu(Sat 6 Mar 10:34:32 CET 2021)\c-";
SWWM_SHORTVER="\cw0.9.11b-pre r322 \cu(2021-03-06 10:34:32)\c-";
SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r323 \cu(Sat 6 Mar 14:07:23 CET 2021)\c-";
SWWM_SHORTVER="\cw0.9.11b-pre r323 \cu(2021-03-06 14:07:23)\c-";

22
zscript/swwm_player.zsc
View file

@ -20,6 +20,7 @@ Class Demolitionist : PlayerPawn
SWWMStats mystats;
int cairtime;
bool hasteleported;
int lastmpain;
@ -711,6 +712,12 @@ Class Demolitionist : PlayerPawn
{
Vector3 oldpos = pos;
Super.Tick();
if ( hasteleported )
{
// we just got teleported, don't count the travel distance
oldpos = pos;
hasteleported = false;
}
// can't be poisoned
PoisonDurationReceived = 0;
PoisonPeriodReceived = 0;
@ -2251,16 +2258,8 @@ Class Demolitionist : PlayerPawn
}
override void PostTeleport( Vector3 destpos, double destangle, int flags )
{
// subtract travel distance from the stats, and add it to a separate stat
double traveldist = level.Vec3Diff(pretelepos,pos).length();
if ( waterlevel < 2 )
{
if ( !player.onground || bNoGravity )
mystats.airdist -= traveldist;
else mystats.grounddist -= traveldist;
}
else mystats.swimdist -= traveldist;
mystats.teledist += traveldist;
hasteleported = true; // notify tick that we teleported, so it ignores the travel distance
mystats.teledist += level.Vec3Diff(pretelepos,pos).length();
// reset all smooth bob variables if angles/velocity aren't carried over
if ( !(flags&TELF_KEEPORIENTATION) )
{
@ -2268,7 +2267,10 @@ Class Demolitionist : PlayerPawn
oldlagpitch = lagpitch = oldpitch = pitch;
}
if ( !(flags&TELF_KEEPVELOCITY) )
{
oldlagvel = lagvel = vel;
lastvelz = vel.z;
}
// notify carried lamp that we just moved
let l = SWWMLamp(FindInventory("SWWMLamp"));
if ( l && l.thelamp )