remove the remainder or demo.freecam
This commit is contained in:
1 parent
b23020435f
commit
26480882c8
3 files changed
+15
-12
No files matched your search
+1
-1
@@ -69,7 +69,7 @@ static fixed_t ScaleFromMap(fixed_t n, fixed_t scale)
|
||||
|
||||
static boolean K_DirectorIsEnabled(void)
|
||||
{
|
||||
return cv_director.value && !splitscreen && (gamestate == GS_LEVEL && (((!playeringame[consoleplayer] || players[consoleplayer].spectator)) || (demo.playback && !demo.freecam && (!demo.title || !modeattacking))) && !K_DirectorIsPlayerAlone());
|
||||
return cv_director.value && !splitscreen && (gamestate == GS_LEVEL && (((!playeringame[consoleplayer] || players[consoleplayer].spectator)) || (demo.playback && !camera[0].freecam && (!demo.title || !modeattacking))) && !K_DirectorIsPlayerAlone());
|
||||
}
|
||||
|
||||
void K_InitDirector(void)
|
||||
|
||||
+9
-10
@@ -4033,19 +4033,19 @@ boolean M_Responder(event_t *ev)
|
||||
// switch viewpoints:
|
||||
case '1': // viewpoint for p1 (also f12)
|
||||
// maximum laziness:
|
||||
if (!demo.freecam)
|
||||
if (!camera[0].freecam)
|
||||
G_AdjustView(1, 1, true);
|
||||
break;
|
||||
case '2': // viewpoint for p2
|
||||
if (!demo.freecam)
|
||||
if (!camera[1].freecam)
|
||||
G_AdjustView(2, 1, true);
|
||||
break;
|
||||
case '3': // viewpoint for p3
|
||||
if (!demo.freecam)
|
||||
if (!camera[2].freecam)
|
||||
G_AdjustView(3, 1, true);
|
||||
break;
|
||||
case '4': // viewpoint for p4
|
||||
if (!demo.freecam)
|
||||
if (!camera[3].freecam)
|
||||
G_AdjustView(4, 1, true);
|
||||
break;
|
||||
|
||||
@@ -4272,19 +4272,19 @@ boolean M_DemoResponder(event_t *ev)
|
||||
// switch viewpoints:
|
||||
case '1': // viewpoint for p1 (also f12)
|
||||
// maximum laziness:
|
||||
if (!demo.freecam)
|
||||
if (!camera[0].freecam)
|
||||
G_AdjustView(1, 1, true);
|
||||
break;
|
||||
case '2': // viewpoint for p2
|
||||
if (!demo.freecam)
|
||||
if (!camera[1].freecam)
|
||||
G_AdjustView(2, 1, true);
|
||||
break;
|
||||
case '3': // viewpoint for p3
|
||||
if (!demo.freecam)
|
||||
if (!camera[2].freecam)
|
||||
G_AdjustView(3, 1, true);
|
||||
break;
|
||||
case '4': // viewpoint for p4
|
||||
if (!demo.freecam)
|
||||
if (!camera[3].freecam)
|
||||
G_AdjustView(4, 1, true);
|
||||
break;
|
||||
|
||||
@@ -7691,8 +7691,7 @@ static void M_PlaybackAdvance(INT32 choice)
|
||||
|
||||
static void M_PlaybackSetViews(INT32 choice)
|
||||
{
|
||||
|
||||
if (demo.freecam)
|
||||
if (camera[0].freecam || camera[1].freecam || camera[2].freecam || camera[3].freecam)
|
||||
return; // not here.
|
||||
|
||||
if (choice > 0)
|
||||
|
||||
+5
-1
@@ -2474,9 +2474,13 @@ static void P_InitCamera(void)
|
||||
|
||||
if (!dedicated)
|
||||
{
|
||||
if (!demo.freecam)
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (camera[i].freecam)
|
||||
continue;
|
||||
|
||||
P_SetupCamera(displayplayers[i], &camera[i]);
|
||||
}
|
||||
|
||||
// Though, I don't think anyone would care about cam_rotate being reset back to the only value that makes sense :P
|
||||
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
|
||||
|
||||
Reference in new issue
Block a user