stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-17 23:21:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/quads' into quads

Browse source 
# Conflicts:
#	src/d_main.c
#	src/r_draw.c
This commit is contained in:
TehRealSalt 2017-12-17 22:32:12 -05:00
commit e7abd77299
4 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/d_netcmd.c
View file

@ -830,8 +830,12 @@ void D_RegisterClientCommands(void)
// Analog Control
CV_RegisterVar(&cv_analog);
CV_RegisterVar(&cv_analog2);
CV_RegisterVar(&cv_analog3);
CV_RegisterVar(&cv_analog4);
CV_RegisterVar(&cv_useranalog);
CV_RegisterVar(&cv_useranalog2);
CV_RegisterVar(&cv_useranalog3);
CV_RegisterVar(&cv_useranalog4);
// s_sound.c
CV_RegisterVar(&cv_soundvolume);

4
src/g_game.c
View file

@ -1200,8 +1200,8 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
{
player = &players[fourthdisplayplayer];
thiscam = &camera4;
lang = localangle3;
laim = localaiming3;
lang = localangle4;
laim = localaiming4;
th = turnheld4;
kbl = keyboard_look4;
G_CopyTiccmd(cmd, I_BaseTiccmd4(), 1);

28
src/p_user.c
View file

@ -8354,7 +8354,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
camdist = FixedMul(cv_cam_dist.value, mo->scale);
camheight = FixedMul(cv_cam_height.value, mo->scale);
}
else // Camera 2
else if (thiscam == &camera2) // Camera 2
{
camspeed = cv_cam2_speed.value;
camstill = cv_cam2_still.value;
@ -8362,6 +8362,22 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
camdist = FixedMul(cv_cam2_dist.value, mo->scale);
camheight = FixedMul(cv_cam2_height.value, mo->scale);
}
else if (thiscam == &camera3) // Camera 3
{
camspeed = cv_cam3_speed.value;
camstill = cv_cam3_still.value;
camrotate = cv_cam3_rotate.value;
camdist = FixedMul(cv_cam3_dist.value, mo->scale);
camheight = FixedMul(cv_cam3_height.value, mo->scale);
}
else // Camera 4
{
camspeed = cv_cam4_speed.value;
camstill = cv_cam4_still.value;
camrotate = cv_cam4_rotate.value;
camdist = FixedMul(cv_cam4_dist.value, mo->scale);
camheight = FixedMul(cv_cam4_height.value, mo->scale);
}
#ifdef REDSANALOG
if (P_AnalogMove(player) && (player->cmd.buttons & (BT_FORWARD|BT_BACKWARD)) == (BT_FORWARD|BT_BACKWARD)) {
@ -8430,10 +8446,18 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
{
CV_SetValue(&cv_cam_rotate, camrotate + 180);
}
else
else if (thiscam == &camera2)
{
CV_SetValue(&cv_cam2_rotate, camrotate + 180);
}
else if (thiscam == &camera3)
{
CV_SetValue(&cv_cam3_rotate, camrotate + 180);
}
else
{
CV_SetValue(&cv_cam4_rotate, camrotate + 180);
}
player->kartstuff[k_camspin] = 2;
}
if (player->kartstuff[k_camspin] == -1)

2
src/r_main.c
View file

@ -1485,6 +1485,8 @@ void R_RegisterEngineStuff(void)
CV_RegisterVar(&cv_homremoval);
CV_RegisterVar(&cv_flipcam);
CV_RegisterVar(&cv_flipcam2);
CV_RegisterVar(&cv_flipcam3);
CV_RegisterVar(&cv_flipcam4);
// Enough for dedicated server
if (dedicated)