vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'democam' into 'master' 

If I were a bad Democam, I wouldn't be sittin' here discussin' it with ya now would I?!

See merge request KartKrew/Kart!48
This commit is contained in:
Sal 2018-10-19 15:50:28 -04:00
parent 4994e9749f c8cd84ca34
commit 734b7008c4
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/g_game.c
View File

@ -4499,6 +4499,13 @@ void G_ReadDemoTiccmd(ticcmd_t *cmd, INT32 playernum)
G_CopyTiccmd(cmd, &oldcmd, 1);
// SRB2kart: Copy-pasted from ticcmd building, removes that crappy demo cam
if (((players[displayplayer].mo && players[displayplayer].speed > 0) // Moving
|| (leveltime > starttime && (cmd->buttons & BT_ACCELERATE && cmd->buttons & BT_BRAKE)) // Rubber-burn turn
|| (players[displayplayer].spectator || objectplacing)) // Not a physical player
&& !(players[displayplayer].kartstuff[k_spinouttimer] && players[displayplayer].kartstuff[k_sneakertimer])) // Spinning and boosting cancels out spinout
localangle += (cmd->angleturn<<16);
if (!(demoflags & DF_GHOST) && *demo_p == DEMOMARKER)
{
// end of demo data stream

1
src/g_game.h
View File

@ -188,7 +188,6 @@ void G_StopMetalDemo(void);
ATTRNORETURN void FUNCNORETURN G_StopMetalRecording(void);
void G_StopDemo(void);
boolean G_CheckDemoStatus(void);
char *G_DemoPlayerName(char *defdemoname);
boolean G_IsSpecialStage(INT32 mapnum);
boolean G_GametypeUsesLives(void);

5
src/p_user.c
View File

@ -8216,7 +8216,7 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
// if (leveltime > 0 && timeinmap <= 0)
// return true;
if (player->pflags & PF_NIGHTSMODE)
if (demoplayback)
{
focusangle = mo->angle;
focusaiming = 0;
@ -8323,9 +8323,6 @@ boolean P_MoveChaseCamera(player_t *player, camera_t *thiscam, boolean resetcall
input = InvAngle(input);
angle = thiscam->angle + input;
if (demoplayback && player == &players[consoleplayer])
localangle = angle;
}
if (!resetcalled && (leveltime > starttime)

4
src/r_main.c
View File

@ -861,7 +861,7 @@ void R_SkyboxFrame(player_t *player)
{
aimingangle = player->aiming;
viewangle = player->mo->angle;
if (!demoplayback && player->playerstate != PST_DEAD)
if (/*!demoplayback && */player->playerstate != PST_DEAD)
{
if (player == &players[consoleplayer])
{
@ -1138,7 +1138,7 @@ void R_SetupFrame(player_t *player, boolean skybox)
aimingangle = player->aiming;
viewangle = viewmobj->angle;
if (!demoplayback && player->playerstate != PST_DEAD)
if (/*!demoplayback && */player->playerstate != PST_DEAD)
{
if (player == &players[consoleplayer])
{