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

Merge branch 'awful-mix' into 'awful-mix'

Browse source 
Fix lol xd compiler errors

See merge request SinnamonLat/Kart-Public!2
This commit is contained in:
wolfs 2020-04-08 17:04:06 -04:00
commit 54472b5c22
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_clisrv.c
View file

@ -5202,7 +5202,7 @@ static void Local_Maketic(INT32 realtics)
void SV_SpawnPlayer(INT32 playernum, INT32 x, INT32 y, angle_t angle) void SV_SpawnPlayer(INT32 playernum, INT32 x, INT32 y, angle_t angle)
{ {
tic_t tic; tic_t tic;
UINT8 numadjust = 0; UINT16 numadjust = 0;
(void)x; (void)x;
(void)y; (void)y;

13
src/p_user.c
View file

@ -7231,9 +7231,13 @@ static ticcmd_t *P_CameraCmd(camera_t *cam)
boolean turnleft, turnright, mouseaiming; boolean turnleft, turnright, mouseaiming;
boolean invertmouse, lookaxis, usejoystick, kbl; boolean invertmouse, lookaxis, usejoystick, kbl;
angle_t lang; angle_t lang;
INT32 player_invert;
INT32 screen_invert;
ticcmd_t *cmd = &cameracmd; ticcmd_t *cmd = &cameracmd;
(void)cam;
if (!demo.playback) if (!demo.playback)
return cmd; // empty cmd, no. return cmd; // empty cmd, no.
@ -7312,8 +7316,8 @@ static ticcmd_t *P_CameraCmd(camera_t *cam)
// spectator aiming shit, ahhhh... // spectator aiming shit, ahhhh...
INT32 player_invert = invertmouse ? -1 : 1; player_invert = invertmouse ? -1 : 1;
INT32 screen_invert = 1; // nope screen_invert = 1; // nope
// mouse look stuff (mouse look is not the same as mouse aim) // mouse look stuff (mouse look is not the same as mouse aim)
kbl = false; kbl = false;
@ -7425,13 +7429,12 @@ void P_DemoCameraMovement(camera_t *cam)
void P_ResetCamera(player_t *player, camera_t *thiscam) void P_ResetCamera(player_t *player, camera_t *thiscam)
{ {
tic_t tries = 0;
fixed_t x, y, z;
if (demo.freecam) if (demo.freecam)
return; // do not reset the camera there. return; // do not reset the camera there.
tic_t tries = 0;
fixed_t x, y, z;
if (!player->mo) if (!player->mo)
return; return;