Fix mp desync due to incorrect 6DOF CVar handling.

This commit is contained in:
Mari the Deer 2020-07-15 10:19:57 +02:00
commit 0d43b7de18
3 changed files with 3 additions and 3 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

View file

@ -1,2 +1,2 @@
[default]
SWWM_MODVER="\chSWWM \cwGZ\c- r416 (Sat 11 Jul 20:12:53 CEST 2020)";
SWWM_MODVER="\chSWWM \cwGZ\c- r416 (Wed 15 Jul 10:19:57 CEST 2020)";

View file

@ -763,7 +763,7 @@ Class Demolitionist : PlayerPawn
}
else guideangle += .2*player.cmd.yaw*(360./65536.);
guidepitch -= .2*player.cmd.pitch*(360./65536.);
if ( !fly6dof ) fly6dof = CVar.GetCVar('swwm_fly6dof',players[consoleplayer]);
if ( !fly6dof ) fly6dof = CVar.GetCVar('swwm_fly6dof',player);
if ( player.centering ) guidepitch = clamp(deltaangle(pitch,0),-3.,3.);
if ( player.centering || !fly6dof.GetBool() ) guideroll = clamp(deltaangle(roll,0),-3.,3.);
if ( fly6dof.GetBool() )
@ -1416,7 +1416,7 @@ Class Demolitionist : PlayerPawn
}
override bool Used( Actor user )
{
if ( !(user is 'Demolitionist') || !user.player ) return false;
if ( !(user is 'Demolitionist') || !player || (player.mo != self) ) return false;
if ( (user.player == players[consoleplayer]) && (health > 0) )
{
SWWMHandler.AddOneliner("greet",2);