diff --git a/src/d_main.c b/src/d_main.c index 576901307..4ce0efa8d 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -818,7 +818,14 @@ void D_SRB2Loop(void) rendertimefrac = FRACUNIT; } - rendertimefrac_unpaused = g_time.timefrac; + if (!hu_stopped) + { + rendertimefrac_unpaused = g_time.timefrac; + } + else + { + rendertimefrac_unpaused = FRACUNIT; + } } else { diff --git a/src/d_netcmd.c b/src/d_netcmd.c index bef6b0997..bcd9b5797 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -572,14 +572,7 @@ static CV_PossibleValue_t ps_descriptor_cons_t[] = { {1, "Average"}, {2, "SD"}, {3, "Minimum"}, {4, "Maximum"}, {0, NULL}}; consvar_t cv_ps_descriptor = {"ps_descriptor", "Average", 0, ps_descriptor_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; -//consvar_t cv_director = {"director", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; - -consvar_t cv_director[MAXSPLITSCREENPLAYERS] = { - {"director", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, - {"director2", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, - {"director3", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}, - {"director4", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL} -}; +consvar_t cv_director = {"director", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_kartdebugdirector = {"debugdirector", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_showdirectorhud = {"showdirectorhud", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; diff --git a/src/g_game.c b/src/g_game.c index 14c095228..b25442bdd 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1211,9 +1211,6 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer) { displayplayers[0] = consoleplayer; G_FixCamera(1); - // i dont like this lmao - if (cv_director[0].value) - CV_SetValue(&cv_director[0], 0); } } diff --git a/src/g_game.h b/src/g_game.h index 7c81ab79e..3a957d00a 100644 --- a/src/g_game.h +++ b/src/g_game.h @@ -438,8 +438,6 @@ FUNCMATH INT32 G_TicsToSeconds(tic_t tics); FUNCMATH INT32 G_TicsToCentiseconds(tic_t tics); FUNCMATH INT32 G_TicsToMilliseconds(tic_t tics); -boolean K_DirectorIsPlayerAlone(void); // idk where else to put this lol - // Don't split up TOL handling INT16 G_TOLFlag(INT32 pgametype); diff --git a/src/k_director.c b/src/k_director.c index a91221af8..49b518523 100644 --- a/src/k_director.c +++ b/src/k_director.c @@ -31,7 +31,6 @@ struct directorinfo { - UINT8 viewnum; player_t* viewplayer; tic_t cooldown; // how long has it been since we last switched? tic_t freeze; // when nonzero, fixed switch pending, freeze logic! @@ -43,9 +42,7 @@ struct directorinfo INT32 boredom[MAXPLAYERS]; // how long has a given position had no credible attackers? } directorinfo; -struct directorinfo directorinfosplit[MAXSPLITSCREENPLAYERS]; - -boolean K_DirectorIsPlayerAlone(void) +static boolean K_DirectorIsPlayerAlone(void) { UINT8 pingame = 0; @@ -74,11 +71,16 @@ static fixed_t ScaleFromMap(fixed_t n, fixed_t scale) return FixedMul(n, FixedDiv(scale, mapobjectscale)); } -boolean K_DirectorIsAvailable(UINT8 viewnum) +boolean K_DirectorIsAvailable(void) { if ((demo.playback && demo.title) || modeattacking) return false; - return ((gamestate == GS_LEVEL) && (demo.playback || ((viewnum <= splitscreen) && (!playeringame[displayplayers[viewnum]] || players[displayplayers[viewnum]].spectator) && !camera[viewnum].freecam && !K_DirectorIsPlayerAlone()))); + return ((gamestate == GS_LEVEL) && (demo.playback || (players[consoleplayer].spectator && !K_DirectorIsPlayerAlone()))); +} + +static boolean K_DirectorIsEnabled(void) +{ + return (cv_director.value && K_DirectorIsAvailable()); } static boolean K_DirectorIsEnabled(const UINT8 viewnum) @@ -90,7 +92,11 @@ void K_InitDirector(void) { INT32 playernum; - directorinfo.viewnum = 0; + directorinfo.cooldown = SWITCHTIME; + directorinfo.freeze = 0; + directorinfo.attacker = 0; + directorinfo.maxdist = 0; + directorinfo.viewplayer = NULL; for (UINT8 i = 0; i < MAXSPLITSCREENPLAYERS; i++) { @@ -233,11 +239,6 @@ static void K_DirectorSwitch(INT32 player, boolean force, const UINT8 viewnum) return; } - if (P_IsDisplayPlayer(&players[player])) - { - return; - } - if (players[player].exiting) { return; @@ -270,7 +271,7 @@ void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source) return; } - if (directorinfosplit[directorinfo.viewnum].viewplayer != player) + if (directorinfo.viewplayer != player) { return; } @@ -340,8 +341,7 @@ void K_DrawDirectorDebugger(void) void K_UpdateDirector(const UINT8 viewnum) { INT32 targetposition; - directorinfo.viewnum = viewnum; - directorinfosplit[directorinfo.viewnum].viewplayer = &players[displayplayers[directorinfo.viewnum]]; + directorinfo.viewplayer = &players[displayplayers[0]]; if (!K_DirectorIsEnabled(directorinfo.viewnum)) { @@ -412,17 +412,11 @@ void K_UpdateDirector(const UINT8 viewnum) target = directorinfosplit[directorinfo.viewnum].sortedplayers[targetposition]; // stop here since we're already viewing this player - if (displayplayers[directorinfo.viewnum] == target) + if (displayplayers[0] == target) { break; } - // if this is a splitscreen player, try next pair - if (P_IsDisplayPlayer(&players[target])) - { - continue; - } - // if we're certain the back half of the pair is actually in this position, try to switch if (!players[target].kartstuff[k_positiondelay]) { @@ -430,7 +424,7 @@ void K_UpdateDirector(const UINT8 viewnum) } // even if we're not certain, if we're cetain we're watching the WRONG player, try to switch - if (directorinfosplit[directorinfo.viewnum].viewplayer->kartstuff[k_position] != targetposition+1 && !directorinfosplit[directorinfo.viewnum].viewplayer->kartstuff[k_positiondelay]) + if (directorinfo.viewplayer->kartstuff[k_position] != targetposition+1 && !directorinfo.viewplayer->kartstuff[k_positiondelay]) { K_DirectorSwitch(target, false, directorinfo.viewnum); } @@ -441,15 +435,17 @@ void K_UpdateDirector(const UINT8 viewnum) void K_ToggleDirector(const UINT8 viewnum) { - if (!K_DirectorIsAvailable(viewnum)) + if (!K_DirectorIsAvailable()) return; - if (!K_DirectorIsEnabled(viewnum)) + G_AdjustView(1, 1, true); + + if (!K_DirectorIsEnabled()) { directorinfosplit[viewnum].cooldown = 0; // switch immediately } directortoggletimer = 0; - CV_SetValue(&cv_director[viewnum], (cv_director[viewnum].value ^ 1)); + CV_SetValue(&cv_director, (cv_director.value ^ 1)); } diff --git a/src/k_director.h b/src/k_director.h index acc00b253..23ab8d9f7 100644 --- a/src/k_director.h +++ b/src/k_director.h @@ -10,7 +10,7 @@ /// \file k_director.h /// \brief SRB2kart automatic spectator camera. -boolean K_DirectorIsAvailable(UINT8 viewnum); +boolean K_DirectorIsAvailable(void); void K_InitDirector(void); void K_UpdateDirector(UINT8 viewnum); void K_DrawDirectorDebugger(void); diff --git a/src/k_kart.c b/src/k_kart.c index f386b5ad9..ec8e5aa73 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -7608,7 +7608,7 @@ static void K_initKartHUD(void) // K_GetScreenCoords needs the right view* variables R_SetViewContext(stplyrnum); - R_InterpolateView(R_UsingFrameInterpolation() ? rendertimefrac : FRACUNIT, !cv_uncappedhud.value); + R_InterpolateView(R_UsingFrameInterpolation() ? rendertimefrac_unpaused : FRACUNIT, !cv_uncappedhud.value); } INT32 K_calcSplitFlags(INT32 snapflags) @@ -9311,7 +9311,7 @@ static void K_drawDriftGauge(void) 0, 31, 47, 63, 79, 95, 111, 119, 127, 143, 159, 175, 183, 191, 199, 207, 223, 247 }; - if (demo.playback && camera[stplyrnum].freecam) + if (camera[stplyrnum].freecam) return; if (P_MobjWasRemoved(stplyr->mo) || (!splitscreen && !camera->chase)) diff --git a/src/m_menu.c b/src/m_menu.c index f3a0d8ca9..0b9f16067 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -3410,12 +3410,10 @@ void PDistort_menu_Onchange(void) { if (!cv_sloperoll.value) { - OP_PlayerDistortMenu[sloperotate].status = IT_GRAYEDOUT; OP_PlayerDistortMenu[sliptide].status = IT_GRAYEDOUT; } else { - OP_PlayerDistortMenu[sloperotate].status = IT_STRING | IT_CVAR; OP_PlayerDistortMenu[sliptide].status = IT_STRING | IT_CVAR; } @@ -12101,6 +12099,7 @@ static void M_Setup1PControlsMenu(INT32 choice) OP_AllControlsMenu[19].status = IT_CONTROL; // GIF OP_AllControlsMenu[20].status = IT_CONTROL; // System Menu OP_AllControlsMenu[21].status = IT_CONTROL; // Console + OP_AllControlsMenu[35].status = IT_CONTROL; // Director M_SetupNextMenu(&OP_AllControlsDef); } @@ -12123,6 +12122,7 @@ static void M_Setup2PControlsMenu(INT32 choice) OP_AllControlsMenu[19].status = IT_GRAYEDOUT2; // GIF OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // System Menu OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Console + OP_AllControlsMenu[35].status = IT_GRAYEDOUT2; // Director M_SetupNextMenu(&OP_AllControlsDef); } @@ -12145,6 +12145,7 @@ static void M_Setup3PControlsMenu(INT32 choice) OP_AllControlsMenu[19].status = IT_GRAYEDOUT2; // GIF OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // System Menu OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Console + OP_AllControlsMenu[35].status = IT_GRAYEDOUT2; // Director M_SetupNextMenu(&OP_AllControlsDef); } @@ -12167,6 +12168,7 @@ static void M_Setup4PControlsMenu(INT32 choice) OP_AllControlsMenu[19].status = IT_GRAYEDOUT2; // GIF OP_AllControlsMenu[20].status = IT_GRAYEDOUT2; // System Menu OP_AllControlsMenu[21].status = IT_GRAYEDOUT2; // Console + OP_AllControlsMenu[35].status = IT_GRAYEDOUT2; // Director M_SetupNextMenu(&OP_AllControlsDef); } diff --git a/src/p_user.c b/src/p_user.c index 3e7e80747..868704d45 100644 --- a/src/p_user.c +++ b/src/p_user.c @@ -3153,9 +3153,11 @@ void P_ToggleDemoCamera(UINT8 viewnum) } } +static ticcmd_t cameracmd[MAXSPLITSCREENPLAYERS]; + static ticcmd_t *P_CameraCmd(camera_t *cam, UINT8 num) { - INT32 laim, th, tspeed, forward, side, axis; + INT32 laim, forward, side, axis; // these ones used for multiple conditions boolean turnleft, turnright; @@ -3163,14 +3165,30 @@ static ticcmd_t *P_CameraCmd(camera_t *cam, UINT8 num) angle_t lang; const UINT8 forplayer = num+1; - ticcmd_t *cmd = D_LocalTiccmd(num); + memset(&cameracmd[num], 0, sizeof(ticcmd_t)); // initialize cmd - if (!cam->freecam) - return cmd; // empty cmd, no. + ticcmd_t *cmd = &cameracmd[num]; lang = cam->localangle; laim = cam->localaiming; + switch (num) + { + case 1: + G_CopyTiccmd(cmd, I_BaseTiccmd2(), 1); + break; + case 2: + G_CopyTiccmd(cmd, I_BaseTiccmd3(), 1); + break; + case 3: + G_CopyTiccmd(cmd, I_BaseTiccmd4(), 1); + break; + case 0: + default: + G_CopyTiccmd(cmd, I_BaseTiccmd(), 1); // empty, or external driver + break; + } + cmd->angleturn = (INT16)(lang >> 16); cmd->aiming = G_ClipAimingPitch(&laim); @@ -3200,27 +3218,15 @@ static ticcmd_t *P_CameraCmd(camera_t *cam, UINT8 num) } forward = side = 0; - // use two stage accelerative turning - // on the keyboard and joystick - if (turnleft || turnright) - th += 1; - else - th = 0; - - if (th < SLOWTURNTICS) - tspeed = 2; // slow turn - else - tspeed = 1; - // let movement keys cancel each other out if (turnright && !(turnleft)) { - cmd->angleturn = (INT16)(cmd->angleturn - (angleturn[tspeed])); + cmd->angleturn = (INT16)(cmd->angleturn - (angleturn[1])); side += sidemove[1]; } else if (turnleft && !(turnright)) { - cmd->angleturn = (INT16)(cmd->angleturn + (angleturn[tspeed])); + cmd->angleturn = (INT16)(cmd->angleturn + (angleturn[1])); side -= sidemove[1]; } diff --git a/src/r_main.c b/src/r_main.c index 87d703a1d..27ec6c09b 100644 --- a/src/r_main.c +++ b/src/r_main.c @@ -1064,8 +1064,6 @@ R_SetupCommonFrame ( player_t * player, subsector_t * subsector) { - const UINT8 viewnum = R_GetViewNumber(); - newview->player = player; newview->x += quake.x; @@ -1079,7 +1077,7 @@ R_SetupCommonFrame else newview->sector = R_PointInSubsector(newview->x, newview->y)->sector; - R_InterpolateView(R_UsingFrameInterpolation() ? (camera[viewnum].freecam ? rendertimefrac_unpaused : rendertimefrac) : FRACUNIT, false); + R_InterpolateView(R_UsingFrameInterpolation() ? rendertimefrac_unpaused : FRACUNIT, false); } static void R_SetupAimingFrame(player_t *player, camera_t *thiscam) diff --git a/src/st_stuff.c b/src/st_stuff.c index 2769ae413..7b91bec7a 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -679,7 +679,7 @@ static void ST_overlayDrawer(void) if (!hu_showscores) // hide the following if TAB is held { // TODO: splitscreen support! - if (cv_showdirectorhud.value && !splitscreen && !P_IsLocalPlayer(stplyr) && K_DirectorIsAvailable(0) && !K_DirectorIsPlayerAlone()) + if (cv_showdirectorhud.value && !splitscreen && !P_IsLocalPlayer(stplyr) && K_DirectorIsAvailable()) { char directortext[20] = {0}; diff --git a/src/st_stuff.h b/src/st_stuff.h index 308dae2a0..250db1e7f 100644 --- a/src/st_stuff.h +++ b/src/st_stuff.h @@ -146,6 +146,4 @@ extern UINT16 objectsdrawn; extern consvar_t cv_lessflicker; extern consvar_t cv_stagetitle; -extern boolean directortextactive; - #endif