make freecam speed per splitscreenplayer + add to menu

This commit is contained in:
Alug committed 2025-03-12 07:01:19 +01:00
1 parent 88b78a5bf7
commit c081349f9b
4 files changed
+41 -38

No files matched your search

+29 -20
View File
@@ -1907,48 +1907,56 @@ static menuitem_t OP_Player1CamOptionsMenu[] =
{
{IT_HEADER, NULL, "Player 1 Camera Options", NULL, 0},
{IT_STRING | IT_CVAR, NULL, "Flipcam", &cv_flipcam[0], 30},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Distance", &cv_cam_dist[0], 40},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Height", &cv_cam_height[0], 50},
{IT_STRING | IT_CVAR, NULL, "Camera Speed", &cv_cam_speed[0], 60},
{IT_STRING | IT_CVAR, NULL, "Flipcam", &cv_flipcam[0], 30},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Distance", &cv_cam_dist[0], 50},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Height", &cv_cam_height[0], 60},
{IT_STRING | IT_CVAR, NULL, "Camera Speed", &cv_cam_speed[0], 70},
{IT_STRING | IT_CVAR, NULL, "Third Person Camera", &cv_chasecam[0], 85},
{IT_STRING | IT_CVAR, NULL, "Freecam Speed", &cv_freecam_speed[0], 90},
{IT_STRING | IT_CVAR, NULL, "Third Person Camera", &cv_chasecam[0], 105},
};
static menuitem_t OP_Player2CamOptionsMenu[] =
{
{IT_HEADER, NULL, "Player 2 Camera Options", NULL, 0},
{IT_STRING | IT_CVAR, NULL, "Flipcam", &cv_flipcam[1], 30},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Distance", &cv_cam_dist[1], 40},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Height", &cv_cam_height[1], 50},
{IT_STRING | IT_CVAR, NULL, "Camera Speed", &cv_cam_speed[1], 60},
{IT_STRING | IT_CVAR, NULL, "Flipcam", &cv_flipcam[1], 30},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Distance", &cv_cam_dist[1], 50},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Height", &cv_cam_height[1], 60},
{IT_STRING | IT_CVAR, NULL, "Camera Speed", &cv_cam_speed[1], 70},
{IT_STRING | IT_CVAR, NULL, "Third Person Camera", &cv_chasecam[1], 85},
{IT_STRING | IT_CVAR, NULL, "Freecam Speed", &cv_freecam_speed[1], 90},
{IT_STRING | IT_CVAR, NULL, "Third Person Camera", &cv_chasecam[1], 105},
};
static menuitem_t OP_Player3CamOptionsMenu[] =
{
{IT_HEADER, NULL, "Player 3 Camera Options", NULL, 0},
{IT_STRING | IT_CVAR, NULL, "Flipcam", &cv_flipcam[2], 30},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Distance", &cv_cam_dist[2], 40},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Height", &cv_cam_height[2], 50},
{IT_STRING | IT_CVAR, NULL, "Camera Speed", &cv_cam_speed[2], 60},
{IT_STRING | IT_CVAR, NULL, "Flipcam", &cv_flipcam[2], 30},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Distance", &cv_cam_dist[2], 50},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Height", &cv_cam_height[2], 60},
{IT_STRING | IT_CVAR, NULL, "Camera Speed", &cv_cam_speed[2], 70},
{IT_STRING | IT_CVAR, NULL, "Third Person Camera", &cv_chasecam[2], 85},
{IT_STRING | IT_CVAR, NULL, "Freecam Speed", &cv_freecam_speed[2], 90},
{IT_STRING | IT_CVAR, NULL, "Third Person Camera", &cv_chasecam[2], 105},
};
static menuitem_t OP_Player4CamOptionsMenu[] =
{
{IT_HEADER, NULL, "Player 4 Camera Options", NULL, 0},
{IT_STRING | IT_CVAR, NULL, "Flipcam", &cv_flipcam[3], 30},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Distance", &cv_cam_dist[3], 40},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Height", &cv_cam_height[3], 50},
{IT_STRING | IT_CVAR, NULL, "Camera Speed", &cv_cam_speed[3], 60},
{IT_STRING | IT_CVAR, NULL, "Flipcam", &cv_flipcam[3], 30},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Distance", &cv_cam_dist[3], 50},
{IT_STRING | IT_CVAR | IT_CV_BIGFLOAT, NULL, "Camera Height", &cv_cam_height[3], 60},
{IT_STRING | IT_CVAR, NULL, "Camera Speed", &cv_cam_speed[3], 70},
{IT_STRING | IT_CVAR, NULL, "Third Person Camera", &cv_chasecam[3], 85},
{IT_STRING | IT_CVAR, NULL, "Freecam Speed", &cv_freecam_speed[3], 90},
{IT_STRING | IT_CVAR, NULL, "Third Person Camera", &cv_chasecam[3], 105},
};
static const char* OP_PlayerCamOptionsTooltips[] =
@@ -1958,6 +1966,7 @@ static const char* OP_PlayerCamOptionsTooltips[] =
"Camera distance relative to the Player.",
"Height of the Camera",
"Speed of the Camera",
"Speed of the Freecam/Spectator Camera",
"Toggle between Third or First Person camera",
};
+1 -1
View File
@@ -150,7 +150,7 @@ extern consvar_t cv_cam_speed[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_cam_rotate[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_cam_timeover[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_freecam_speed;
extern consvar_t cv_freecam_speed[MAXSPLITSCREENPLAYERS];
extern consvar_t cv_tilting;
extern consvar_t cv_quaketilt;
+10 -15
View File
@@ -3099,7 +3099,12 @@ consvar_t cv_cam_timeover[MAXSPLITSCREENPLAYERS] = {
};
static CV_PossibleValue_t freecam_speed_cons_t[] = {{0, "MIN"}, {10, "MAX"}, {0, NULL}};
consvar_t cv_freecam_speed = {"freecam_speed", "1", CV_SAVE, freecam_speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_freecam_speed[MAXSPLITSCREENPLAYERS] = {
{"freecam_speed", "1", CV_SAVE, freecam_speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
{"freecam2_speed", "1", CV_SAVE, freecam_speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
{"freecam3_speed", "1", CV_SAVE, freecam_speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
{"freecam4_speed", "1", CV_SAVE, freecam_speed_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL},
};
consvar_t cv_tilting = {"tilting", "Off", CV_SAVE|CV_CALL, CV_OnOff, Bird_menu_Onchange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_quaketilt = {"quaketilt", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -3376,19 +3381,9 @@ static void P_DemoCameraMovement(camera_t *cam, UINT8 num)
// camera movement:
if (!cam->button_a_held)
{
fixed_t spd = 32*mapobjectscale*cv_freecam_speed.value;
fixed_t spd = (32*mapobjectscale*cv_freecam_speed[num].value);
int dir = ((cmd->buttons & BT_ACCELERATE || InputDown(gc_camfloat, forplayer)) ? 1 : 0) + ((cmd->buttons & BT_BRAKE || InputDown(gc_camsink, forplayer)) ? -1 : 0);
switch (dir)
{
case 1:
cam->z += spd;
break;
case -1:
cam->z -= spd;
break;
}
cam->z += spd * dir;
}
if (!(cmd->buttons & (BT_ACCELERATE | BT_DRIFT) || InputDown(gc_camfloat, forplayer)) && cam->button_a_held)
@@ -3440,7 +3435,7 @@ static void P_DemoCameraMovement(camera_t *cam, UINT8 num)
cam->momx = cam->momy = cam->momz = 0;
if (cmd->forwardmove != 0)
{
fixed_t spd = cmd->forwardmove*mapobjectscale*cv_freecam_speed.value;
fixed_t spd = cmd->forwardmove*mapobjectscale*cv_freecam_speed[num].value;
thrustangle = cam->angle >> ANGLETOFINESHIFT;
@@ -3461,7 +3456,7 @@ static void P_DemoCameraMovement(camera_t *cam, UINT8 num)
if (cmd->sidemove != 0) // was disabled in practice anyways, since sidemove was suppressed
{
//False I fixed this shit - Nep
fixed_t spd = cmd->sidemove*mapobjectscale*cv_freecam_speed.value;
fixed_t spd = cmd->sidemove*mapobjectscale*cv_freecam_speed[num].value;
thrustangle = (cam->angle-ANGLE_90) >> ANGLETOFINESHIFT;
cam->x += FixedMul(spd, FINECOSINE(thrustangle));
+1 -2
View File
@@ -1561,10 +1561,9 @@ void R_RegisterEngineStuff(void)
CV_RegisterVar(&cv_cam_speed[i]);
CV_RegisterVar(&cv_cam_rotate[i]);
CV_RegisterVar(&cv_cam_timeover[i]);
CV_RegisterVar(&cv_freecam_speed[i]);
}
CV_RegisterVar(&cv_freecam_speed);
CV_RegisterVar(&cv_tilting);
CV_RegisterVar(&cv_quaketilt);
CV_RegisterVar(&cv_tiltsmoothing);