Merge branch 'nospecmove' into Saturn-Testing
This commit is contained in:
commit
cb223d7ddf
2 files changed
+7
-2
No files matched your search
@@ -868,6 +868,9 @@ static void G_BuildLocalTiccmd(ticcmd_t *cmd, UINT8 ssplayer)
|
||||
|
||||
#undef CHECKINPUT
|
||||
|
||||
axis = JoyAxis(AXISLOOKBACK, ssplayer);
|
||||
camspin[ssplayer-1] = (InputDown(gc_lookback, ssplayer) || (usejoystick && axis > 0));
|
||||
|
||||
// Reset to our spec player if we watch someone else.
|
||||
if ((moveinput || cmd->buttons)
|
||||
&& displayplayers[0] != consoleplayer && ssplayer == 1)
|
||||
|
||||
+4
-2
@@ -3138,9 +3138,11 @@ void P_ToggleDemoCamera(UINT8 viewnum)
|
||||
{
|
||||
camera_t *cam = &camera[viewnum];
|
||||
|
||||
// dont let freecam be toggled when in spec lel
|
||||
if (players[displayplayers[viewnum]].spectator)
|
||||
// dont toggle freecam when in spec
|
||||
// special case since only non splitscreen can change viewpoints
|
||||
if ((!splitscreen && players[consoleplayer].spectator) || players[displayplayers[viewnum]].spectator)
|
||||
{
|
||||
cam->freecam = false;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user