Merge branch 'analog-netgame-camera-fix' into 'next'

Fix F12ing an analog player changing cam_rotate

I didn't test this but it looks like it would work. Idk.

See merge request !70
This commit is contained in:
Inuyasha 2016-05-07 06:06:06 -04:00
commit 6db957c9ed

View file

@ -7993,7 +7993,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
thiscam->angle = angle;
}
if (!objectplacing && !(twodlevel || (mo->flags2 & MF2_TWOD)) && !(player->pflags & PF_NIGHTSMODE))
if (!objectplacing && !(twodlevel || (mo->flags2 & MF2_TWOD)) && !(player->pflags & PF_NIGHTSMODE) && displayplayer == consoleplayer)
{
#ifdef REDSANALOG
if ((player->cmd.buttons & (BT_CAMLEFT|BT_CAMRIGHT)) == (BT_CAMLEFT|BT_CAMRIGHT)); else