thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-10 10:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git.magicalgirl.moe:KartKrew/Kart into v2-master

Browse source
This commit is contained in:
Latapostrophe 2020-05-09 11:33:11 +02:00
commit e9f184f95f
3 changed files with 64 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/command.c
View file

@ -717,8 +717,7 @@ static void COM_Exec_f(void)
CONS_Printf(M_GetText("executing %s\n"), COM_Argv(1)); CONS_Printf(M_GetText("executing %s\n"), COM_Argv(1));
// insert text file into the command buffer // insert text file into the command buffer
COM_BufAddText((char *)buf); COM_ImmedExecute((char *)buf);
COM_BufAddText("\n");
// free buffer // free buffer
Z_Free(buf); Z_Free(buf);

4
src/p_mobj.c
View file

@ -2130,6 +2130,7 @@ static void P_RingZMovement(mobj_t *mo)
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo)) if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
{ {
mo->momz += mo->pmomz; mo->momz += mo->pmomz;
mo->pmomz = 0;
mo->eflags &= ~MFE_APPLYPMOMZ; mo->eflags &= ~MFE_APPLYPMOMZ;
} }
mo->z += mo->momz; mo->z += mo->momz;
@ -2207,6 +2208,7 @@ static boolean P_ZMovement(mobj_t *mo)
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo)) if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
{ {
mo->momz += mo->pmomz; mo->momz += mo->pmomz;
mo->pmomz = 0;
mo->eflags &= ~MFE_APPLYPMOMZ; mo->eflags &= ~MFE_APPLYPMOMZ;
} }
mo->z += mo->momz; mo->z += mo->momz;
@ -2691,6 +2693,7 @@ static void P_PlayerZMovement(mobj_t *mo)
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo)) if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
{ {
mo->momz += mo->pmomz; mo->momz += mo->pmomz;
mo->pmomz = 0;
mo->eflags &= ~MFE_APPLYPMOMZ; mo->eflags &= ~MFE_APPLYPMOMZ;
} }
@ -2984,6 +2987,7 @@ static boolean P_SceneryZMovement(mobj_t *mo)
if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo)) if (mo->eflags & MFE_APPLYPMOMZ && !P_IsObjectOnGround(mo))
{ {
mo->momz += mo->pmomz; mo->momz += mo->pmomz;
mo->pmomz = 0;
mo->eflags &= ~MFE_APPLYPMOMZ; mo->eflags &= ~MFE_APPLYPMOMZ;
} }
mo->z += mo->momz; mo->z += mo->momz;

15
src/y_inter.c
View file

@ -156,6 +156,7 @@ static y_votelvlinfo levelinfo[5];
static y_voteclient voteclient; static y_voteclient voteclient;
static INT32 votetic; static INT32 votetic;
static INT32 voteendtic = -1; static INT32 voteendtic = -1;
static boolean votenotyetpicked;
static patch_t *cursor = NULL; static patch_t *cursor = NULL;
static patch_t *cursor1 = NULL; static patch_t *cursor1 = NULL;
static patch_t *cursor2 = NULL; static patch_t *cursor2 = NULL;
@ -1604,11 +1605,17 @@ void Y_VoteTicker(void)
else else
voteclient.ranim = pickedvote; voteclient.ranim = pickedvote;
} }
else else if (votenotyetpicked)
{ {
if (votetic < 3*(NEWTICRATE/7)) // give it some time before letting you control it :V if (votetic < 3*(NEWTICRATE/7)) // give it some time before letting you control it :V
return; return;
/*
The vote ended, but it will take at least a tic for that to reach us from
the server. Don't let me change the vote now, it won't matter anyway!
*/
if (timer)
{
for (i = 0; i <= splitscreen; i++) for (i = 0; i <= splitscreen; i++)
{ {
UINT8 p; UINT8 p;
@ -1667,6 +1674,7 @@ void Y_VoteTicker(void)
voteclient.playerinfo[i].delay = NEWTICRATE/7; voteclient.playerinfo[i].delay = NEWTICRATE/7;
} }
} }
}
if (server) if (server)
{ {
@ -1689,10 +1697,13 @@ void Y_VoteTicker(void)
timer = 0; timer = 0;
if (voteendtic == -1) if (voteendtic == -1)
{
votenotyetpicked = false;/* don't pick vote twice */
D_PickVote(); D_PickVote();
} }
} }
} }
}
// //
// Y_StartVote // Y_StartVote
@ -1723,6 +1734,8 @@ void Y_StartVote(void)
timer = cv_votetime.value*TICRATE; timer = cv_votetime.value*TICRATE;
pickedvote = -1; pickedvote = -1;
votenotyetpicked = true;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {
voteclient.playerinfo[i].selection = 0; voteclient.playerinfo[i].selection = 0;