Merge branch 'next' into color-fixes
This commit is contained in:
commit
9c14a2c58f
|
@ -4400,12 +4400,12 @@ FILESTAMP
|
||||||
//Update client ping table from the server.
|
//Update client ping table from the server.
|
||||||
if (client)
|
if (client)
|
||||||
{
|
{
|
||||||
INT32 i;
|
UINT8 i;
|
||||||
for (i = 0; i < MAXPLAYERS; i++)
|
for (i = 0; i < MAXPLAYERS; i++)
|
||||||
if (playeringame[i])
|
if (playeringame[i])
|
||||||
playerpingtable[i] = (tic_t)netbuffer->u.pingtable[i];
|
playerpingtable[i] = (tic_t)netbuffer->u.pingtable[i];
|
||||||
|
|
||||||
servermaxping = (tic_t)netbuffer->u.pingtable[i++];
|
servermaxping = (tic_t)netbuffer->u.pingtable[MAXPLAYERS];
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
@ -5096,9 +5096,10 @@ static inline void PingUpdate(void)
|
||||||
pingtimeout[i]++;
|
pingtimeout[i]++;
|
||||||
if (pingtimeout[i] > cv_pingtimeout.value) // ok your net has been bad for too long, you deserve to die.
|
if (pingtimeout[i] > cv_pingtimeout.value) // ok your net has been bad for too long, you deserve to die.
|
||||||
{
|
{
|
||||||
pingtimeout[i] = 0;
|
|
||||||
XBOXSTATIC char buf[2];
|
XBOXSTATIC char buf[2];
|
||||||
|
|
||||||
|
pingtimeout[i] = 0;
|
||||||
|
|
||||||
buf[0] = (char)i;
|
buf[0] = (char)i;
|
||||||
buf[1] = KICK_MSG_PING_HIGH;
|
buf[1] = KICK_MSG_PING_HIGH;
|
||||||
SendNetXCmd(XD_KICK, &buf, 2);
|
SendNetXCmd(XD_KICK, &buf, 2);
|
||||||
|
@ -5121,7 +5122,7 @@ static inline void PingUpdate(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
// send the server's maxping as last element of our ping table. This is useful to let us know when we're about to get kicked.
|
// send the server's maxping as last element of our ping table. This is useful to let us know when we're about to get kicked.
|
||||||
netbuffer->u.pingtable[i++] = cv_maxping.value;
|
netbuffer->u.pingtable[MAXPLAYERS] = cv_maxping.value;
|
||||||
|
|
||||||
//send out our ping packets
|
//send out our ping packets
|
||||||
for (i = 0; i < MAXNETNODES; i++)
|
for (i = 0; i < MAXNETNODES; i++)
|
||||||
|
|
|
@ -452,10 +452,10 @@ typedef struct
|
||||||
serverrefuse_pak serverrefuse; // 65025 bytes (somehow I feel like those values are garbage...)
|
serverrefuse_pak serverrefuse; // 65025 bytes (somehow I feel like those values are garbage...)
|
||||||
askinfo_pak askinfo; // 61 bytes
|
askinfo_pak askinfo; // 61 bytes
|
||||||
msaskinfo_pak msaskinfo; // 22 bytes
|
msaskinfo_pak msaskinfo; // 22 bytes
|
||||||
plrinfo playerinfo[MAXPLAYERS]; // 1152 bytes (I'd say 36~38)
|
plrinfo playerinfo[MAXPLAYERS]; // 576 bytes(?)
|
||||||
plrconfig playerconfig[MAXPLAYERS]; // (up to) 896 bytes (welp they ARE)
|
plrconfig playerconfig[MAXPLAYERS]; // (up to) 528 bytes(?)
|
||||||
#ifdef NEWPING
|
#ifdef NEWPING
|
||||||
UINT32 pingtable[MAXPLAYERS]; // 128 bytes
|
UINT32 pingtable[MAXPLAYERS+1]; // 68 bytes
|
||||||
#endif
|
#endif
|
||||||
} u; // This is needed to pack diff packet types data together
|
} u; // This is needed to pack diff packet types data together
|
||||||
} ATTRPACK doomdata_t;
|
} ATTRPACK doomdata_t;
|
||||||
|
|
|
@ -4896,9 +4896,9 @@ void G_WriteGhostTic(mobj_t *ghost)
|
||||||
void G_ConsGhostTic(void)
|
void G_ConsGhostTic(void)
|
||||||
{
|
{
|
||||||
UINT8 ziptic;
|
UINT8 ziptic;
|
||||||
UINT32 px,py,pz,gx,gy,gz;
|
fixed_t px,py,pz,gx,gy,gz;
|
||||||
mobj_t *testmo;
|
mobj_t *testmo;
|
||||||
UINT32 syncleeway;
|
fixed_t syncleeway;
|
||||||
boolean nightsfail = false;
|
boolean nightsfail = false;
|
||||||
|
|
||||||
if (!demo_p || !demo_start)
|
if (!demo_p || !demo_start)
|
||||||
|
|
15
src/k_kart.c
15
src/k_kart.c
|
@ -2839,11 +2839,24 @@ void K_SpawnSparkleTrail(mobj_t *mo)
|
||||||
void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
|
void K_SpawnWipeoutTrail(mobj_t *mo, boolean translucent)
|
||||||
{
|
{
|
||||||
mobj_t *dust;
|
mobj_t *dust;
|
||||||
|
angle_t aoff;
|
||||||
|
|
||||||
I_Assert(mo != NULL);
|
I_Assert(mo != NULL);
|
||||||
I_Assert(!P_MobjWasRemoved(mo));
|
I_Assert(!P_MobjWasRemoved(mo));
|
||||||
|
|
||||||
dust = P_SpawnMobj(mo->x + (P_RandomRange(-25,25) * mo->scale), mo->y + (P_RandomRange(-25,25) * mo->scale), mo->z, MT_WIPEOUTTRAIL);
|
if (mo->player)
|
||||||
|
aoff = (mo->player->frameangle + ANGLE_180);
|
||||||
|
else
|
||||||
|
aoff = (mo->angle + ANGLE_180);
|
||||||
|
|
||||||
|
if ((leveltime / 2) & 1)
|
||||||
|
aoff -= ANGLE_45;
|
||||||
|
else
|
||||||
|
aoff += ANGLE_45;
|
||||||
|
|
||||||
|
dust = P_SpawnMobj(mo->x + FixedMul(24*mo->scale, FINECOSINE(aoff>>ANGLETOFINESHIFT)) + (P_RandomRange(-8,8) << FRACBITS),
|
||||||
|
mo->y + FixedMul(24*mo->scale, FINESINE(aoff>>ANGLETOFINESHIFT)) + (P_RandomRange(-8,8) << FRACBITS),
|
||||||
|
mo->z, MT_WIPEOUTTRAIL);
|
||||||
|
|
||||||
P_SetTarget(&dust->target, mo);
|
P_SetTarget(&dust->target, mo);
|
||||||
dust->angle = R_PointToAngle2(0,0,mo->momx,mo->momy);
|
dust->angle = R_PointToAngle2(0,0,mo->momx,mo->momy);
|
||||||
|
|
Loading…
Reference in New Issue