diff --git a/src/g_game.c b/src/g_game.c
index b03c4ccd..104159c0 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1657,11 +1657,6 @@ static void Analog_OnChange(void)
// cameras are not initialized at this point
- if (leveltime > 1)
- CV_SetValue(&cv_cam_dist, 128);
- if (cv_analog.value || demoplayback)
- CV_SetValue(&cv_cam_dist, 192);
-
if (!cv_chasecam.value && cv_analog.value) {
CV_SetValue(&cv_analog, 0);
return;
@@ -1682,11 +1677,6 @@ static void Analog2_OnChange(void)
// cameras are not initialized at this point
- if (leveltime > 1)
- CV_SetValue(&cv_cam2_dist, 128);
- if (cv_analog2.value)
- CV_SetValue(&cv_cam2_dist, 192);
-
if (!cv_chasecam2.value && cv_analog2.value) {
CV_SetValue(&cv_analog2, 0);
return;
diff --git a/src/k_kart.c b/src/k_kart.c
index c5a9a23a..4562bd7b 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -3031,12 +3031,6 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
if (player->speed > 0 && cmd->forwardmove < 0 && player->mo->friction == 59392)
player->mo->friction += 1608;
- // Splitscreen camera
- if (splitscreen && player == &players[consoleplayer])
- CV_SetValue(&cv_cam_dist, 190);
- if (splitscreen && player == &players[secondarydisplayplayer])
- CV_SetValue(&cv_cam2_dist, 190);
-
K_KartDrift(player, onground);
// Quick Turning
diff --git a/src/p_setup.c b/src/p_setup.c
index de0172eb..f41d1fd7 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -2547,8 +2547,9 @@ boolean P_SetupLevel(boolean skipprecip)
if (!dedicated)
{
- if (!cv_cam_speed.changed)
- CV_Set(&cv_cam_speed, cv_cam_speed.defaultvalue);
+ // Salt: CV_ClearChangedFlags() messes with your settings :(
+ /*if (!cv_cam_speed.changed)
+ CV_Set(&cv_cam_speed, cv_cam_speed.defaultvalue);*/
if (!cv_chasecam.changed)
CV_SetValue(&cv_chasecam, chase);
@@ -2851,20 +2852,22 @@ boolean P_SetupLevel(boolean skipprecip)
}
}
- if (!cv_cam_height.changed)
+ // Salt: CV_ClearChangedFlags() messes with your settings :(
+ /*if (!cv_cam_height.changed)
CV_Set(&cv_cam_height, cv_cam_height.defaultvalue);
- if (!cv_cam_dist.changed)
- CV_Set(&cv_cam_dist, cv_cam_dist.defaultvalue);
-
- if (!cv_cam_rotate.changed)
- CV_Set(&cv_cam_rotate, cv_cam_rotate.defaultvalue);
-
if (!cv_cam2_height.changed)
CV_Set(&cv_cam2_height, cv_cam2_height.defaultvalue);
+
+ if (!cv_cam_dist.changed)
+ CV_Set(&cv_cam_dist, cv_cam_dist.defaultvalue);
if (!cv_cam2_dist.changed)
- CV_Set(&cv_cam2_dist, cv_cam2_dist.defaultvalue);
+ CV_Set(&cv_cam2_dist, cv_cam2_dist.defaultvalue);*/
+
+ // Though, I don't think anyone would care about cam_rotate being reset back to the only value that makes sense :P
+ if (!cv_cam_rotate.changed)
+ CV_Set(&cv_cam_rotate, cv_cam_rotate.defaultvalue);
if (!cv_cam2_rotate.changed)
CV_Set(&cv_cam2_rotate, cv_cam2_rotate.defaultvalue);
diff --git a/src/p_user.c b/src/p_user.c
index 39df492b..ff974376 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8063,18 +8063,18 @@ static CV_PossibleValue_t CV_CamSpeed[] = {{0, "MIN"}, {1*FRACUNIT, "MAX"}, {0,
static CV_PossibleValue_t rotation_cons_t[] = {{1, "MIN"}, {45, "MAX"}, {0, NULL}};
static CV_PossibleValue_t CV_CamRotate[] = {{-720, "MIN"}, {720, "MAX"}, {0, NULL}};
-consvar_t cv_cam_dist = {"cam_dist", "128", CV_FLOAT, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_height = {"cam_height", "40", CV_FLOAT, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_cam_dist = {"cam_dist", "160", CV_FLOAT|CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_cam_height = {"cam_height", "50", CV_FLOAT|CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_cam_still = {"cam_still", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_speed = {"cam_speed", "0.25", CV_FLOAT, CV_CamSpeed, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_cam_speed = {"cam_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_cam_rotate = {"cam_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam_rotspeed = {"cam_rotspeed", "10", 0, rotation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_dist = {"cam2_dist", "128", CV_FLOAT, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_height = {"cam2_height", "40", CV_FLOAT, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_cam_rotspeed = {"cam_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_cam2_dist = {"cam2_dist", "160", CV_FLOAT|CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_cam2_height = {"cam2_height", "50", CV_FLOAT|CV_SAVE, NULL, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_cam2_still = {"cam2_still", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_speed = {"cam2_speed", "0.25", CV_FLOAT, CV_CamSpeed, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_cam2_speed = {"cam2_speed", "0.3", CV_FLOAT|CV_SAVE, CV_CamSpeed, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_cam2_rotate = {"cam2_rotate", "0", CV_CALL|CV_NOINIT, CV_CamRotate, CV_CamRotate2_OnChange, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_cam2_rotspeed = {"cam2_rotspeed", "10", 0, rotation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_cam2_rotspeed = {"cam2_rotspeed", "10", CV_SAVE, rotation_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
fixed_t t_cam_dist = -42;
fixed_t t_cam_height = -42;
@@ -8128,7 +8128,7 @@ void P_ResetCamera(player_t *player, camera_t *thiscam)
boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcalled)
{
angle_t angle = 0, focusangle = 0, focusaiming = 0;
- fixed_t x, y, z, dist, checkdist, viewpointx, viewpointy, camspeed, camdist, camheight, pviewheight;
+ fixed_t x, y, z, dist, height, checkdist, viewpointx, viewpointy, camspeed, camdist, camheight, pviewheight;
INT32 camrotate;
boolean camstill, cameranoclip;
mobj_t *mo;
@@ -8354,6 +8354,8 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
}
*/
+ height = camheight;
+
// sets ideal cam pos
if (twodlevel || (mo->flags2 & MF2_TWOD))
dist = 480<<FRACBITS;
@@ -8363,6 +8365,20 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
{
dist = camdist;
+ // x1.5 dist for splitscreen
+ if (splitscreen)
+ {
+ dist = FixedMul(dist, 3*FRACUNIT/2);
+ height = FixedMul(height, 3*FRACUNIT/2);
+ }
+
+ // x1.2 dist for analog
+ if (P_AnalogMove(player))
+ {
+ dist = FixedMul(dist, 6*FRACUNIT/5);
+ height = FixedMul(height, 6*FRACUNIT/5);
+ }
+
if (player->climbing || player->exiting || player->playerstate == PST_DEAD || (player->pflags & (PF_MACESPIN|PF_ITEMHANG|PF_ROPEHANG)))
dist <<= 1;
}