cleanup director splitscreen stuff
This commit is contained in:
1 parent
7341f77fe1
commit
b0aba7f4a4
5 files changed
+54
-29
No files matched your search
+14
-2
@@ -572,7 +572,15 @@ 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 = {"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_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};
|
||||
|
||||
@@ -1009,7 +1017,11 @@ void D_RegisterClientCommands(void)
|
||||
CV_RegisterVar(&cv_showviewpointtext);
|
||||
CV_RegisterVar(&cv_showdownloadprompt);
|
||||
|
||||
CV_RegisterVar(&cv_director);
|
||||
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
|
||||
{
|
||||
CV_RegisterVar(&cv_director[i]);
|
||||
}
|
||||
|
||||
CV_RegisterVar(&cv_kartdebugdirector);
|
||||
CV_RegisterVar(&cv_showdirectorhud);
|
||||
|
||||
|
||||
+2
-1
@@ -197,7 +197,8 @@ extern consvar_t cv_ps_thinkframe_page;
|
||||
extern consvar_t cv_ps_samplesize;
|
||||
extern consvar_t cv_ps_descriptor;
|
||||
|
||||
extern consvar_t cv_director, cv_kartdebugdirector, cv_showdirectorhud;
|
||||
extern consvar_t cv_director[4]; // screw you includes
|
||||
extern consvar_t cv_kartdebugdirector, cv_showdirectorhud;
|
||||
|
||||
extern consvar_t cv_showtrackaddon;
|
||||
|
||||
|
||||
+13
-7
@@ -338,7 +338,7 @@ INT16 prevmap, nextmap;
|
||||
|
||||
// save if director is enabled
|
||||
// so demos can disable it by default and restore it after
|
||||
static int directorstate = 0;
|
||||
static int directorstate[MAXSPLITSCREENPLAYERS] = {0,0,0,0};
|
||||
tic_t directortoggletimer = 0;
|
||||
|
||||
static CV_PossibleValue_t recordmultiplayerdemos_cons_t[] = {{0, "Disabled"}, {1, "Manual Save"}, {2, "Auto Save"}, {0, NULL}};
|
||||
@@ -1210,8 +1210,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
|
||||
displayplayers[0] = consoleplayer;
|
||||
G_FixCamera(1);
|
||||
// i dont like this lmao
|
||||
if (cv_director.value)
|
||||
CV_SetValue(&cv_director, 0);
|
||||
if (cv_director[0].value)
|
||||
CV_SetValue(&cv_director[0], 0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7291,8 +7291,11 @@ post_compat:
|
||||
players[i].kartweight = kartweight[i];
|
||||
}
|
||||
|
||||
directorstate = cv_director.value;
|
||||
CV_SetValue(&cv_director, 0);
|
||||
for (i = 0; i < MAXSPLITSCREENPLAYERS; i++)
|
||||
{
|
||||
directorstate[i] = cv_director[i].value;
|
||||
CV_SetValue(&cv_director[i], 0);
|
||||
}
|
||||
|
||||
demo.deferstart = true;
|
||||
}
|
||||
@@ -7859,8 +7862,11 @@ void G_StopDemo(void)
|
||||
demobuf.buffer = NULL;
|
||||
if (demo.playback)
|
||||
{
|
||||
CV_SetValue(&cv_director, directorstate);
|
||||
directorstate = 0;
|
||||
for (UINT8 i = 0; i < MAXSPLITSCREENPLAYERS; i++)
|
||||
{
|
||||
CV_SetValue(&cv_director[i], directorstate[i]);
|
||||
directorstate[i] = 0;
|
||||
}
|
||||
}
|
||||
demo.playback = false;
|
||||
if (demo.title)
|
||||
|
||||
+22
-16
@@ -31,7 +31,6 @@
|
||||
|
||||
struct directorinfo
|
||||
{
|
||||
boolean active;
|
||||
tic_t cooldown; // how long has it been since we last switched?
|
||||
tic_t freeze; // when nonzero, fixed switch pending, freeze logic!
|
||||
INT32 attacker; // who to switch to when freeze delay elapses
|
||||
@@ -76,7 +75,7 @@ static fixed_t ScaleFromMap(fixed_t n, fixed_t scale)
|
||||
static boolean K_DirectorIsEnabled(const UINT8 viewnum)
|
||||
{
|
||||
//return cv_director.value && !splitscreen && (gamestate == GS_LEVEL && (((!playeringame[consoleplayer] || players[consoleplayer].spectator)) || (demo.playback && !camera[0].freecam && (!demo.title || !modeattacking))) && !K_DirectorIsPlayerAlone());
|
||||
return directorinfosplit[viewnum].active;
|
||||
return (cv_director[viewnum].value && (gamestate == GS_LEVEL && (((!playeringame[displayplayers[viewnum]] || players[displayplayers[viewnum]].spectator)) || (demo.playback && !camera[viewnum].freecam && (!demo.title || !modeattacking))) && !K_DirectorIsPlayerAlone()));
|
||||
}
|
||||
|
||||
void K_InitDirector(void)
|
||||
@@ -89,7 +88,6 @@ void K_InitDirector(void)
|
||||
directorinfosplit[i].freeze = 0;
|
||||
directorinfosplit[i].attacker = 0;
|
||||
directorinfosplit[i].maxdist = 0;
|
||||
directorinfosplit[i].active = 0;
|
||||
|
||||
for (playernum = 0; playernum < MAXPLAYERS; playernum++)
|
||||
{
|
||||
@@ -254,6 +252,7 @@ static void K_DirectorForceSwitch(INT32 player, INT32 time, const UINT8 viewnum)
|
||||
directorinfosplit[viewnum].freeze = time;
|
||||
}
|
||||
|
||||
// HACK: this is awful but idk any other way to pass the viewnum to this
|
||||
static UINT8 curview = 0;
|
||||
|
||||
void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source)
|
||||
@@ -266,11 +265,6 @@ void K_DirectorFollowAttack(player_t *player, mobj_t *inflictor, mobj_t *source)
|
||||
return;
|
||||
}
|
||||
|
||||
if (!P_IsDisplayPlayer(player))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (inflictor && inflictor->player)
|
||||
{
|
||||
K_DirectorForceSwitch(inflictor->player - players, TRANSFERTIME, curview);
|
||||
@@ -441,6 +435,9 @@ void K_ToggleDirector(const UINT8 viewnum)
|
||||
//if (!directortextactive)
|
||||
//return;
|
||||
|
||||
if (gamestate != GS_LEVEL && (playeringame[displayplayers[viewnum]] || !players[displayplayers[viewnum]].spectator))
|
||||
return;
|
||||
|
||||
if (!K_DirectorIsEnabled(viewnum))
|
||||
{
|
||||
directorinfosplit[viewnum].cooldown = 0; // switch immediately
|
||||
@@ -448,12 +445,21 @@ void K_ToggleDirector(const UINT8 viewnum)
|
||||
|
||||
directortoggletimer = 0;
|
||||
|
||||
if (directorinfosplit[viewnum].active == false)
|
||||
directorinfosplit[viewnum].active = true;
|
||||
else
|
||||
directorinfosplit[viewnum].active = false;
|
||||
|
||||
CONS_Printf("director active %d for %d\n", directorinfosplit[viewnum].active, viewnum);
|
||||
|
||||
//COM_ImmedExecute("add director 1");
|
||||
switch (viewnum)
|
||||
{
|
||||
case 1:
|
||||
COM_ImmedExecute("add director2 1");
|
||||
break;
|
||||
case 2:
|
||||
COM_ImmedExecute("add director3 1");
|
||||
break;
|
||||
case 3:
|
||||
COM_ImmedExecute("add director4 1");
|
||||
break;
|
||||
case 0:
|
||||
COM_ImmedExecute("add director 1");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
+3
-3
@@ -669,9 +669,9 @@ static void ST_overlayDrawer(void)
|
||||
{
|
||||
char directortext[20] = {0};
|
||||
|
||||
snprintf(directortext, 20, "Director: %s", cv_director.value ? "On" : "Off");
|
||||
snprintf(directortext, 20, "Director: %s", cv_director[0].value ? "On" : "Off");
|
||||
|
||||
directortextactive = true;
|
||||
//directortextactive = true;
|
||||
|
||||
if ((!demo.playback && directortoggletimer < 13*TICRATE) || (demo.playback && directortoggletimer < 4*TICRATE))
|
||||
{
|
||||
@@ -687,7 +687,7 @@ static void ST_overlayDrawer(void)
|
||||
else
|
||||
{
|
||||
directortoggletimer = 0;
|
||||
directortextactive = false;
|
||||
//directortextactive = false;
|
||||
}
|
||||
|
||||
if (cv_showviewpointtext.value)
|
||||
|
||||
Reference in new issue
Block a user