diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index c0179ca1be99cff5fb94b2a15b73a81269c02719..f1ed5e9a37004ec50c5a21a8711c706daecbed31 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -98,16 +98,6 @@ static tic_t maketic;
static INT16 consistancy[BACKUPTICS];
-// Resynching shit!
-static UINT32 resynch_score[MAXNETNODES]; // "score" for kicking -- if this gets too high then cfail kick
-static UINT16 resynch_delay[MAXNETNODES]; // delay time before the player can be considered to have desynched
-static UINT32 resynch_status[MAXNETNODES]; // 0 bit means synched for that player, 1 means possibly desynched
-static UINT8 resynch_sent[MAXNETNODES][MAXNETNODES]; // what synch packets have we attempted to send to the player
-static UINT8 resynch_inprogress[MAXNETNODES];
-static UINT8 resynch_local_inprogress = false; // WE are desynched and getting packets to fix it.
-static UINT8 player_joining = false;
-UINT8 hu_resynching = 0;
-
// client specific
static ticcmd_t localcmds;
static ticcmd_t localcmds2;
@@ -472,558 +462,6 @@ void ReadLmpExtraData(UINT8 **demo_pointer, INT32 playernum)
// end extra data function for lmps
// -----------------------------------------------------------------
-// -----------------------------------------------------------------
-// resynch player data
-// -----------------------------------------------------------------
-static inline void resynch_write_player(resynch_pak *rsp, const size_t i)
-{
- size_t j;
-
- rsp->playernum = (UINT8)i;
-
- // Do not send anything visual related.
- // Only send data that we need to know for physics.
- rsp->playerstate = (UINT8)players[i].playerstate; //playerstate_t
- rsp->pflags = (UINT32)LONG(players[i].pflags); //pflags_t
- rsp->panim = (UINT8)players[i].panim; //panim_t
-
- rsp->aiming = (angle_t)LONG(players[i].aiming);
- rsp->currentweapon = LONG(players[i].currentweapon);
- rsp->ringweapons = LONG(players[i].ringweapons);
-
- for (j = 0; j < NUMPOWERS; ++j)
- rsp->powers[j] = (UINT16)SHORT(players[i].powers[j]);
-
- // Score is resynched in the rspfirm resync packet
- rsp->health = 0; // resynched with mo health
- rsp->lives = players[i].lives;
- rsp->continues = players[i].continues;
- rsp->scoreadd = players[i].scoreadd;
- rsp->xtralife = players[i].xtralife;
- rsp->pity = players[i].pity;
-
- rsp->skincolor = players[i].skincolor;
- rsp->skin = LONG(players[i].skin);
- // Just in case Lua does something like
- // modify these at runtime
- rsp->normalspeed = (fixed_t)LONG(players[i].normalspeed);
- rsp->runspeed = (fixed_t)LONG(players[i].runspeed);
- rsp->thrustfactor = players[i].thrustfactor;
- rsp->accelstart = players[i].accelstart;
- rsp->acceleration = players[i].acceleration;
- rsp->charability = players[i].charability;
- rsp->charability2 = players[i].charability2;
- rsp->charflags = (UINT32)LONG(players[i].charflags);
- rsp->thokitem = (UINT32)LONG(players[i].thokitem); //mobjtype_t
- rsp->spinitem = (UINT32)LONG(players[i].spinitem); //mobjtype_t
- rsp->revitem = (UINT32)LONG(players[i].revitem); //mobjtype_t
- rsp->actionspd = LONG(players[i].actionspd);
- rsp->mindash = LONG(players[i].mindash);
- rsp->maxdash = LONG(players[i].maxdash);
- rsp->jumpfactor = (fixed_t)LONG(players[i].jumpfactor);
-
- rsp->speed = (fixed_t)LONG(players[i].speed);
- rsp->jumping = players[i].jumping;
- rsp->secondjump = players[i].secondjump;
- rsp->fly1 = players[i].fly1;
- rsp->glidetime = (tic_t)LONG(players[i].glidetime);
- rsp->climbing = players[i].climbing;
- rsp->deadtimer = players[i].deadtimer;
- rsp->exiting = (tic_t)LONG(players[i].exiting);
- rsp->homing = players[i].homing;
- rsp->cmomx = (fixed_t)LONG(players[i].cmomx);
- rsp->cmomy = (fixed_t)LONG(players[i].cmomy);
- rsp->rmomx = (fixed_t)LONG(players[i].rmomx);
- rsp->rmomy = (fixed_t)LONG(players[i].rmomy);
-
- rsp->weapondelay = LONG(players[i].weapondelay);
- rsp->tossdelay = LONG(players[i].tossdelay);
-
- rsp->starpostx = SHORT(players[i].starpostx);
- rsp->starposty = SHORT(players[i].starposty);
- rsp->starpostz = SHORT(players[i].starpostz);
- rsp->starpostnum = LONG(players[i].starpostnum);
- rsp->starposttime = (tic_t)LONG(players[i].starposttime);
- rsp->starpostangle = (angle_t)LONG(players[i].starpostangle);
-
- rsp->maxlink = LONG(players[i].maxlink);
- rsp->dashspeed = (fixed_t)LONG(players[i].dashspeed);
- rsp->dashtime = LONG(players[i].dashtime);
- rsp->angle_pos = (angle_t)LONG(players[i].angle_pos);
- rsp->old_angle_pos = (angle_t)LONG(players[i].old_angle_pos);
- rsp->bumpertime = (tic_t)LONG(players[i].bumpertime);
- rsp->flyangle = LONG(players[i].flyangle);
- rsp->drilltimer = (tic_t)LONG(players[i].drilltimer);
- rsp->linkcount = LONG(players[i].linkcount);
- rsp->linktimer = (tic_t)LONG(players[i].linktimer);
- rsp->anotherflyangle = LONG(players[i].anotherflyangle);
- rsp->nightstime = (tic_t)LONG(players[i].nightstime);
- rsp->drillmeter = LONG(players[i].drillmeter);
- rsp->drilldelay = players[i].drilldelay;
- rsp->bonustime = players[i].bonustime;
- rsp->mare = players[i].mare;
- rsp->lastsidehit = SHORT(players[i].lastsidehit);
- rsp->lastlinehit = SHORT(players[i].lastlinehit);
-
- rsp->losstime = (tic_t)LONG(players[i].losstime);
- rsp->timeshit = players[i].timeshit;
- rsp->onconveyor = LONG(players[i].onconveyor);
-
- rsp->hasmo = false;
- //Transfer important mo information if the player has a body.
- //This lets us resync players even if they are dead.
- if (!players[i].mo)
- return;
- rsp->hasmo = true;
-
- rsp->health = LONG(players[i].mo->health);
-
- rsp->angle = (angle_t)LONG(players[i].mo->angle);
- rsp->x = LONG(players[i].mo->x);
- rsp->y = LONG(players[i].mo->y);
- rsp->z = LONG(players[i].mo->z);
- rsp->momx = LONG(players[i].mo->momx);
- rsp->momy = LONG(players[i].mo->momy);
- rsp->momz = LONG(players[i].mo->momz);
- rsp->friction = LONG(players[i].mo->friction);
- rsp->movefactor = LONG(players[i].mo->movefactor);
-
- rsp->tics = LONG(players[i].mo->tics);
- rsp->statenum = (statenum_t)LONG(players[i].mo->state-states); // :(
- rsp->eflags = (UINT32)LONG(players[i].mo->eflags);
- rsp->flags = LONG(players[i].mo->flags);
- rsp->flags2 = LONG(players[i].mo->flags2);
-
- rsp->radius = LONG(players[i].mo->radius);
- rsp->height = LONG(players[i].mo->height);
- rsp->scale = LONG(players[i].mo->scale);
- rsp->destscale = LONG(players[i].mo->destscale);
- rsp->scalespeed = LONG(players[i].mo->scalespeed);
-}
-
-static void resynch_read_player(resynch_pak *rsp)
-{
- INT32 i = rsp->playernum, j;
- mobj_t *savedmo = players[i].mo;
-
- // Do not send anything visual related.
- // Only send data that we need to know for physics.
- players[i].playerstate = (UINT8)rsp->playerstate; //playerstate_t
- players[i].pflags = (UINT32)LONG(rsp->pflags); //pflags_t
- players[i].panim = (UINT8)rsp->panim; //panim_t
-
- players[i].aiming = (angle_t)LONG(rsp->aiming);
- players[i].currentweapon = LONG(rsp->currentweapon);
- players[i].ringweapons = LONG(rsp->ringweapons);
-
- for (j = 0; j < NUMPOWERS; ++j)
- players[i].powers[j] = (UINT16)SHORT(rsp->powers[j]);
-
- // Score is resynched in the rspfirm resync packet
- players[i].health = rsp->health;
- players[i].lives = rsp->lives;
- players[i].continues = rsp->continues;
- players[i].scoreadd = rsp->scoreadd;
- players[i].xtralife = rsp->xtralife;
- players[i].pity = rsp->pity;
-
- players[i].skincolor = rsp->skincolor;
- players[i].skin = LONG(rsp->skin);
- // Just in case Lua does something like
- // modify these at runtime
- players[i].normalspeed = (fixed_t)LONG(rsp->normalspeed);
- players[i].runspeed = (fixed_t)LONG(rsp->runspeed);
- players[i].thrustfactor = rsp->thrustfactor;
- players[i].accelstart = rsp->accelstart;
- players[i].acceleration = rsp->acceleration;
- players[i].charability = rsp->charability;
- players[i].charability2 = rsp->charability2;
- players[i].charflags = (UINT32)LONG(rsp->charflags);
- players[i].thokitem = (UINT32)LONG(rsp->thokitem); //mobjtype_t
- players[i].spinitem = (UINT32)LONG(rsp->spinitem); //mobjtype_t
- players[i].revitem = (UINT32)LONG(rsp->revitem); //mobjtype_t
- players[i].actionspd = LONG(rsp->actionspd);
- players[i].mindash = LONG(rsp->mindash);
- players[i].maxdash = LONG(rsp->maxdash);
- players[i].jumpfactor = (fixed_t)LONG(rsp->jumpfactor);
-
- players[i].speed = (fixed_t)LONG(rsp->speed);
- players[i].jumping = rsp->jumping;
- players[i].secondjump = rsp->secondjump;
- players[i].fly1 = rsp->fly1;
- players[i].glidetime = (tic_t)LONG(rsp->glidetime);
- players[i].climbing = rsp->climbing;
- players[i].deadtimer = rsp->deadtimer;
- players[i].exiting = (tic_t)LONG(rsp->exiting);
- players[i].homing = rsp->homing;
- players[i].cmomx = (fixed_t)LONG(rsp->cmomx);
- players[i].cmomy = (fixed_t)LONG(rsp->cmomy);
- players[i].rmomx = (fixed_t)LONG(rsp->rmomx);
- players[i].rmomy = (fixed_t)LONG(rsp->rmomy);
-
- players[i].weapondelay = LONG(rsp->weapondelay);
- players[i].tossdelay = LONG(rsp->tossdelay);
-
- players[i].starpostx = SHORT(rsp->starpostx);
- players[i].starposty = SHORT(rsp->starposty);
- players[i].starpostz = SHORT(rsp->starpostz);
- players[i].starpostnum = LONG(rsp->starpostnum);
- players[i].starposttime = (tic_t)LONG(rsp->starposttime);
- players[i].starpostangle = (angle_t)LONG(rsp->starpostangle);
-
- players[i].maxlink = LONG(rsp->maxlink);
- players[i].dashspeed = (fixed_t)LONG(rsp->dashspeed);
- players[i].dashtime = LONG(rsp->dashtime);
- players[i].angle_pos = (angle_t)LONG(rsp->angle_pos);
- players[i].old_angle_pos = (angle_t)LONG(rsp->old_angle_pos);
- players[i].bumpertime = (tic_t)LONG(rsp->bumpertime);
- players[i].flyangle = LONG(rsp->flyangle);
- players[i].drilltimer = (tic_t)LONG(rsp->drilltimer);
- players[i].linkcount = LONG(rsp->linkcount);
- players[i].linktimer = (tic_t)LONG(rsp->linktimer);
- players[i].anotherflyangle = LONG(rsp->anotherflyangle);
- players[i].nightstime = (tic_t)LONG(rsp->nightstime);
- players[i].drillmeter = LONG(rsp->drillmeter);
- players[i].drilldelay = rsp->drilldelay;
- players[i].bonustime = rsp->bonustime;
- players[i].mare = rsp->mare;
- players[i].lastsidehit = SHORT(rsp->lastsidehit);
- players[i].lastlinehit = SHORT(rsp->lastlinehit);
-
- players[i].losstime = (tic_t)LONG(rsp->losstime);
- players[i].timeshit = rsp->timeshit;
- players[i].onconveyor = LONG(rsp->onconveyor);
-
- //We get a packet for each player in game.
- if (!playeringame[i])
- return;
-
- //...but keep old mo even if it is corrupt or null!
- players[i].mo = savedmo;
-
- //Transfer important mo information if they have a valid mo.
- if (!rsp->hasmo)
- return;
-
- //server thinks player has a body.
- //Give them a new body that can be then manipulated by the server's info.
- if (!players[i].mo) //client thinks it has no body.
- P_SpawnPlayer(i);
-
- //At this point, the player should have a body, whether they were respawned or not.
- P_UnsetThingPosition(players[i].mo);
- players[i].mo->angle = (angle_t)LONG(rsp->angle);
- players[i].mo->eflags = (UINT32)LONG(rsp->eflags);
- players[i].mo->flags = LONG(rsp->flags);
- players[i].mo->flags2 = LONG(rsp->flags2);
- players[i].mo->friction = LONG(rsp->friction);
- players[i].mo->health = LONG(rsp->health);
- players[i].mo->momx = LONG(rsp->momx);
- players[i].mo->momy = LONG(rsp->momy);
- players[i].mo->momz = LONG(rsp->momz);
- players[i].mo->movefactor = LONG(rsp->movefactor);
- players[i].mo->tics = LONG(rsp->tics);
- P_SetMobjStateNF(players[i].mo, LONG(rsp->statenum));
- players[i].mo->x = LONG(rsp->x);
- players[i].mo->y = LONG(rsp->y);
- players[i].mo->z = LONG(rsp->z);
- players[i].mo->radius = LONG(rsp->radius);
- players[i].mo->height = LONG(rsp->height);
- // P_SetScale is redundant for this, as all related variables are already restored properly.
- players[i].mo->scale = LONG(rsp->scale);
- players[i].mo->destscale = LONG(rsp->destscale);
- players[i].mo->scalespeed = LONG(rsp->scalespeed);
-
- // And finally, SET THE MOBJ SKIN damn it.
- players[i].mo->skin = &skins[players[i].skin];
- players[i].mo->color = players[i].skincolor;
-
- P_SetThingPosition(players[i].mo);
-}
-
-static inline void resynch_write_ctf(resynchend_pak *rst)
-{
- mobj_t *mflag;
- UINT8 i, j;
-
- for (i = 0, mflag = redflag; i < 2; ++i, mflag = blueflag)
- {
- rst->flagx[i] = rst->flagy[i] = rst->flagz[i] = 0;
- rst->flagloose[i] = rst->flagflags[i] = 0;
- rst->flagplayer[i] = -1;
-
- if (!mflag)
- {
- // Should be held by a player
- for (j = 0; j < MAXPLAYERS; ++j)
- {
- // GF_REDFLAG is 1, GF_BLUEFLAG is 2
- // redflag handling is i=0, blueflag is i=1
- // so check for gotflag == (i+1)
- if (!playeringame[j] || players[j].gotflag != (i+1))
- continue;
- rst->flagplayer[i] = (SINT8)j;
- break;
- }
- if (j == MAXPLAYERS) // fine, no I_Error
- {
- CONS_Alert(CONS_ERROR, "One of the flags has gone completely missing...\n");
- rst->flagplayer[i] = -2;
- }
- continue;
- }
-
- rst->flagx[i] = (fixed_t)LONG(mflag->x);
- rst->flagy[i] = (fixed_t)LONG(mflag->y);
- rst->flagz[i] = (fixed_t)LONG(mflag->z);
- rst->flagflags[i] = LONG(mflag->flags2);
- rst->flagloose[i] = LONG(mflag->fuse); // Dropped or not?
- }
-}
-
-static inline void resynch_read_ctf(resynchend_pak *p)
-{
- UINT8 i;
-
- for (i = 0; i < MAXPLAYERS; ++i)
- players[i].gotflag = 0;
-
- // Red flag
- if (p->flagplayer[0] == -2)
- ; // The server doesn't even know what happened to it...
- else if (p->flagplayer[0] != -1) // Held by a player
- {
- if (!playeringame[p->flagplayer[0]])
- I_Error("Invalid red flag player %d who isn't in the game!", (INT32)p->flagplayer[0]);
- players[p->flagplayer[0]].gotflag = GF_REDFLAG;
- if (redflag)
- {
- P_RemoveMobj(redflag);
- redflag = NULL;
- }
- }
- else
- {
- if (!redflag)
- redflag = P_SpawnMobj(0,0,0,MT_REDFLAG);
-
- P_UnsetThingPosition(redflag);
- redflag->x = (fixed_t)LONG(p->flagx[0]);
- redflag->y = (fixed_t)LONG(p->flagy[0]);
- redflag->z = (fixed_t)LONG(p->flagz[0]);
- redflag->flags2 = LONG(p->flagflags[0]);
- redflag->fuse = LONG(p->flagloose[0]);
- P_SetThingPosition(redflag);
- }
-
- // Blue flag
- if (p->flagplayer[1] == -2)
- ; // The server doesn't even know what happened to it...
- else if (p->flagplayer[1] != -1) // Held by a player
- {
- if (!playeringame[p->flagplayer[1]])
- I_Error("Invalid blue flag player %d who isn't in the game!", (INT32)p->flagplayer[1]);
- players[p->flagplayer[1]].gotflag = GF_BLUEFLAG;
- if (blueflag)
- {
- P_RemoveMobj(blueflag);
- blueflag = NULL;
- }
- }
- else
- {
- if (!blueflag)
- blueflag = P_SpawnMobj(0,0,0,MT_BLUEFLAG);
-
- P_UnsetThingPosition(blueflag);
- blueflag->x = (fixed_t)LONG(p->flagx[1]);
- blueflag->y = (fixed_t)LONG(p->flagy[1]);
- blueflag->z = (fixed_t)LONG(p->flagz[1]);
- blueflag->flags2 = LONG(p->flagflags[1]);
- blueflag->fuse = LONG(p->flagloose[1]);
- P_SetThingPosition(blueflag);
- }
-}
-
-static inline void resynch_write_others(resynchend_pak *rst)
-{
- UINT8 i;
-
- rst->ingame = rst->ctfteam = 0;
-
- for (i = 0; i < MAXPLAYERS; ++i)
- {
- if (!playeringame[i])
- {
- rst->score[i] = 0;
- rst->numboxes[i] = 0;
- rst->totalring[i] = 0;
- rst->realtime[i] = 0;
- rst->laps[i] = 0;
- continue;
- }
-
- if (!players[i].spectator)
- {
- rst->ingame |= (1<<i);
- if (players[i].ctfteam > 1)
- rst->ctfteam |= (1<<i);
- }
- rst->score[i] = (UINT32)LONG(players[i].score);
- rst->numboxes[i] = SHORT(players[i].numboxes);
- rst->totalring[i] = SHORT(players[i].totalring);
- rst->realtime[i] = (tic_t)LONG(players[i].realtime);
- rst->laps[i] = players[i].laps;
- }
-
- // endian safeness
- rst->ingame = (UINT32)LONG(rst->ingame);
- rst->ctfteam = (UINT32)LONG(rst->ctfteam);
-}
-
-static inline void resynch_read_others(resynchend_pak *p)
-{
- UINT8 i;
- UINT32 loc_ingame = (UINT32)LONG(p->ingame);
- UINT32 loc_ctfteam = (UINT32)LONG(p->ctfteam);
-
- for (i = 0; i < MAXPLAYERS; ++i)
- {
- // We don't care if they're in the game or not, just write all the data.
- if (loc_ingame & (1<<i))
- {
- players[i].spectator = false;
- players[i].ctfteam = (loc_ctfteam & (1<<i)) ? 2 : 1;
- }
- else
- {
- players[i].spectator = true;
- players[i].ctfteam = 0;
- }
- players[i].score = (UINT32)LONG(p->score[i]);
- players[i].numboxes = SHORT(p->numboxes[i]);
- players[i].totalring = SHORT(p->totalring[i]);
- players[i].realtime = (tic_t)LONG(p->realtime[i]);
- players[i].laps = p->laps[i];
- }
-}
-
-static void SV_InitResynchVars(INT32 node)
-{
- resynch_delay[node] = TICRATE; // initial one second delay
- resynch_score[node] = 0; // clean slate
- resynch_status[node] = 0x00;
- resynch_inprogress[node] = false;
- memset(resynch_sent[node], 0, MAXNETNODES);
-}
-
-static void SV_RequireResynch(INT32 node)
-{
- INT32 i;
-
- resynch_delay[node] = 10; // Delay before you can fail sync again
- resynch_score[node] += 200; // Add score for initial desynch
- resynch_status[node] = 0xFF; // No players assumed synched
- resynch_inprogress[node] = true; // so we know to send a PT_RESYNCHEND after sync
-
- // Initial setup
- memset(resynch_sent[node], 0, MAXNETNODES);
- for (i = 0; i < MAXPLAYERS; ++i)
- {
- if (!playeringame[i]) // Player not in game so just drop it from required synch
- resynch_status[node] &= ~(1<<i);
- else if (i == node); // instantly update THEIR position
- else // Send at random times based on num players
- resynch_sent[node][i] = M_RandomKey(D_NumPlayers()>>1)+1;
- }
-}
-
-static void SV_SendResynch(INT32 node)
-{
- INT32 i, j;
-
- if (!nodeingame[node])
- {
- // player left during resynch
- // so obviously we don't need to do any of this anymore
- resynch_inprogress[node] = false;
- return;
- }
-
- // resynched?
- if (!resynch_status[node])
- {
- // you are now synched
- resynch_inprogress[node] = false;
-
- netbuffer->packettype = PT_RESYNCHEND;
-
- netbuffer->u.resynchend.randomseed = P_GetRandSeed();
- if (gametype == GT_CTF)
- resynch_write_ctf(&netbuffer->u.resynchend);
- resynch_write_others(&netbuffer->u.resynchend);
-
- HSendPacket(node, true, 0, (sizeof(resynchend_pak)));
- return;
- }
-
- netbuffer->packettype = PT_RESYNCHING;
- for (i = 0, j = 0; i < MAXPLAYERS; ++i)
- {
- // if already synched don't bother
- if (!(resynch_status[node] & 1<<i))
- continue;
-
- // waiting for a reply or just waiting in general
- if (resynch_sent[node][i])
- {
- --resynch_sent[node][i];
- continue;
- }
-
- resynch_write_player(&netbuffer->u.resynchpak, i);
- HSendPacket(node, false, 0, (sizeof(resynch_pak)));
-
- resynch_sent[node][i] = TICRATE;
- resynch_score[node] += 2; // penalty for send
-
- if (++j > 3)
- break;
- }
-
- if (resynch_score[node] > (unsigned)cv_resynchattempts.value*250)
- {
- XBOXSTATIC UINT8 buf[2];
- buf[0] = (UINT8)nodetoplayer[node];
- buf[1] = KICK_MSG_CON_FAIL;
- SendNetXCmd(XD_KICK, &buf, 2);
- resynch_score[node] = 0;
- }
-}
-
-static void CL_AcknowledgeResynch(resynch_pak *rsp)
-{
- resynch_read_player(rsp);
-
- netbuffer->packettype = PT_RESYNCHGET;
- netbuffer->u.resynchgot = rsp->playernum;
- HSendPacket(servernode, true, 0, sizeof(UINT8));
-}
-
-static void SV_AcknowledgeResynchAck(INT32 node, UINT8 rsg)
-{
- if (rsg >= MAXPLAYERS)
- resynch_score[node] += 16384; // lol.
- else
- {
- resynch_status[node] &= ~(1<<rsg);
- --resynch_score[node]; // unpenalize
- }
-}
-// -----------------------------------------------------------------
-// end resynch
-// -----------------------------------------------------------------
-
static INT16 Consistancy(void);
#ifndef NONET
@@ -2219,9 +1657,6 @@ static void CL_RemovePlayer(INT32 playernum)
playerpernode[node]--;
if (playerpernode[node] <= 0)
{
- // If a resynch was in progress, well, it no longer needs to be.
- SV_InitResynchVars(playernode[playernum]);
-
nodeingame[playernode[playernum]] = false;
Net_CloseConnection(playernode[playernum]);
ResetNode(node);
@@ -2684,8 +2119,6 @@ consvar_t cv_allownewplayer = {"allowjoin", "On", CV_NETVAR, CV_OnOff, NULL, 0,
consvar_t cv_joinnextround = {"joinnextround", "Off", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; /// \todo not done
static CV_PossibleValue_t maxplayers_cons_t[] = {{2, "MIN"}, {32, "MAX"}, {0, NULL}};
consvar_t cv_maxplayers = {"maxplayers", "8", CV_SAVE, maxplayers_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
-static CV_PossibleValue_t resynchattempts_cons_t[] = {{0, "MIN"}, {20, "MAX"}, {0, NULL}};
-consvar_t cv_resynchattempts = {"resynchattempts", "10", 0, resynchattempts_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL };
consvar_t cv_blamecfail = {"blamecfail", "Off", 0, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL };
// max file size to send to a player (in kilobytes)
@@ -2717,7 +2150,6 @@ void D_ClientServerInit(void)
CV_RegisterVar(&cv_allownewplayer);
CV_RegisterVar(&cv_joinnextround);
CV_RegisterVar(&cv_showjoinaddress);
- CV_RegisterVar(&cv_resynchattempts);
CV_RegisterVar(&cv_blamecfail);
#ifdef DUMPCONSISTENCY
CV_RegisterVar(&cv_dumpconsistency);
@@ -2759,13 +2191,8 @@ void SV_ResetServer(void)
tictoclear = maketic;
for (i = 0; i < MAXNETNODES; i++)
- {
ResetNode(i);
- // Make sure resynch status doesn't get carried over!
- SV_InitResynchVars(i);
- }
-
for (i = 0; i < MAXPLAYERS; i++)
{
#ifdef HAVE_BLUA
@@ -3161,9 +2588,6 @@ static void HandleConnect(SINT8 node)
#endif
SV_AddNode(node);
- // you get a free second before desynch checks. use it wisely.
- SV_InitResynchVars(node);
-
if (cv_joinnextround.value && gameaction == ga_nothing)
G_SetGamestate(GS_WAITINGPLAYERS);
if (!SV_SendServerConfig(node))
@@ -3188,7 +2612,6 @@ static void HandleConnect(SINT8 node)
DEBFILE("send savegame\n");
}
SV_AddWaitingPlayers();
- player_joining = true;
}
#else
#ifndef NONET
@@ -3243,8 +2666,6 @@ static void GetPackets(void)
XBOXSTATIC UINT8 *pak, *txtpak, numtxtpak;
FILESTAMP
- player_joining = false;
-
while (HGetPacket())
{
node = (SINT8)doomcom->remotenode;
@@ -3429,9 +2850,6 @@ FILESTAMP
switch (netbuffer->packettype)
{
// -------------------------------------------- SERVER RECEIVE ----------
- case PT_RESYNCHGET:
- SV_AcknowledgeResynchAck(netconsole, netbuffer->u.resynchgot);
- break;
case PT_CLIENTCMD:
case PT_CLIENT2CMD:
case PT_CLIENTMIS:
@@ -3441,10 +2859,6 @@ FILESTAMP
if (!server)
break;
- // ignore tics from those not synched
- if (resynch_inprogress[node])
- break;
-
// to save bytes, only the low byte of tic numbers are sent
// Figure out what the rest of the bytes are
realstart = ExpandTics(netbuffer->u.clientpak.client_tic);
@@ -3492,47 +2906,6 @@ FILESTAMP
if (netbuffer->packettype == PT_CLIENT2CMD && nodetoplayer2[node] >= 0)
G_MoveTiccmd(&netcmds[maketic%BACKUPTICS][(UINT8)nodetoplayer2[node]],
&netbuffer->u.client2pak.cmd2, 1);
-
- // a delay before we check resynching
- // used on join or just after a synch fail
- if (resynch_delay[node])
- {
- --resynch_delay[node];
- break;
- }
- // check player consistancy during the level
- if (realstart <= gametic && realstart > gametic - BACKUPTICS+1 && gamestate == GS_LEVEL
- && consistancy[realstart%BACKUPTICS] != SHORT(netbuffer->u.clientpak.consistancy))
- {
- SV_RequireResynch(node);
-
- if (cv_resynchattempts.value && resynch_score[node] <= (unsigned)cv_resynchattempts.value*250)
- {
- if (cv_blamecfail.value)
- CONS_Printf(M_GetText("Synch failure for player %d (%s); expected %hd, got %hd\n"),
- netconsole+1, player_names[netconsole],
- consistancy[realstart%BACKUPTICS],
- SHORT(netbuffer->u.clientpak.consistancy));
- DEBFILE(va("Restoring player %d (synch failure) [%update] %d!=%d\n",
- netconsole, realstart, consistancy[realstart%BACKUPTICS],
- SHORT(netbuffer->u.clientpak.consistancy)));
- break;
- }
- else
- {
- XBOXSTATIC UINT8 buf[3];
-
- buf[0] = (UINT8)netconsole;
- buf[1] = KICK_MSG_CON_FAIL;
- SendNetXCmd(XD_KICK, &buf, 2);
- DEBFILE(va("player %d kicked (synch failure) [%u] %d!=%d\n",
- netconsole, realstart, consistancy[realstart%BACKUPTICS],
- SHORT(netbuffer->u.clientpak.consistancy)));
- break;
- }
- }
- else if (resynch_score[node])
- --resynch_score[node];
break;
case PT_TEXTCMD2: // splitscreen special
netconsole = nodetoplayer2[node];
@@ -3609,31 +2982,6 @@ FILESTAMP
nodeingame[node] = false;
break;
// -------------------------------------------- CLIENT RECEIVE ----------
- case PT_RESYNCHEND:
- // Only accept PT_RESYNCHEND from the server.
- if (node != servernode)
- {
- CONS_Alert(CONS_WARNING, M_GetText("%s recieved from non-host %d\n"), "PT_RESYNCHEND", node);
-
- if (server)
- {
- XBOXSTATIC UINT8 buf[2];
- buf[0] = (UINT8)node;
- buf[1] = KICK_MSG_CON_FAIL;
- SendNetXCmd(XD_KICK, &buf, 2);
- }
-
- break;
- }
- resynch_local_inprogress = false;
-
- P_SetRandSeed(netbuffer->u.resynchend.randomseed);
-
- if (gametype == GT_CTF)
- resynch_read_ctf(&netbuffer->u.resynchend);
- resynch_read_others(&netbuffer->u.resynchend);
-
- break;
case PT_SERVERTICS:
// Only accept PT_SERVERTICS from the server.
if (node != servernode)
@@ -3693,25 +3041,6 @@ FILESTAMP
else
DEBFILE(va("frame not in bound: %u\n", neededtic));
break;
- case PT_RESYNCHING:
- // Only accept PT_RESYNCHING from the server.
- if (node != servernode)
- {
- CONS_Alert(CONS_WARNING, M_GetText("%s recieved from non-host %d\n"), "PT_RESYNCHING", node);
-
- if (server)
- {
- XBOXSTATIC char buf[2];
- buf[0] = (char)node;
- buf[1] = KICK_MSG_CON_FAIL;
- SendNetXCmd(XD_KICK, &buf, 2);
- }
-
- break;
- }
- resynch_local_inprogress = true;
- CL_AcknowledgeResynch(&netbuffer->u.resynchpak);
- break;
#ifdef NEWPING
case PT_PING:
// Only accept PT_PING from the server.
@@ -4075,9 +3404,6 @@ void TryRunTics(tic_t realtics)
}
#endif
- if (player_joining)
- return;
-
if (neededtic > gametic)
{
if (advancedemo)
@@ -4213,19 +3539,13 @@ FILESTAMP
MasterClient_Ticker(); // acking the master server
if (!server)
- {
- if (!resynch_local_inprogress)
- CL_SendClientCmd(); // send tic cmd
- hu_resynching = resynch_local_inprogress;
- }
+ CL_SendClientCmd(); // send tic cmd
else
{
if (!demoplayback)
{
INT32 counts;
- hu_resynching = false;
-
firstticstosend = gametic;
for (i = 0; i < MAXNETNODES; i++)
if (nodeingame[i] && nettics[i] < firstticstosend)
@@ -4234,31 +3554,18 @@ FILESTAMP
// Don't erase tics not acknowledged
counts = realtics;
- for (i = 0; i < MAXNETNODES; ++i)
- if (resynch_inprogress[i])
- {
- SV_SendResynch(i);
- counts = -666;
- }
-
- // do not make tics while resynching
- if (counts != -666)
- {
- if (maketic + counts >= firstticstosend + BACKUPTICS)
- counts = firstticstosend+BACKUPTICS-maketic-1;
+ if (maketic + counts >= firstticstosend + BACKUPTICS)
+ counts = firstticstosend+BACKUPTICS-maketic-1;
- for (i = 0; i < counts; i++)
- SV_Maketic(); // create missed tics and increment maketic
+ for (i = 0; i < counts; i++)
+ SV_Maketic(); // create missed tics and increment maketic
- for (; tictoclear < firstticstosend; tictoclear++) // clear only when acknoledged
- D_Clearticcmd(tictoclear); // clear the maketic the new tic
+ for (; tictoclear < firstticstosend; tictoclear++) // clear only when acknoledged
+ D_Clearticcmd(tictoclear); // clear the maketic the new tic
- SV_SendTics();
+ SV_SendTics();
- neededtic = maketic; // the server is a client too
- }
- else
- hu_resynching = true;
+ neededtic = maketic; // the server is a client too
}
}
Net_AckTicker();
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 6bc06f13a5e00e2e8bbe572ac208ba469644ab43..f89041d4735f627ce037ef5cffda073fc1b1829b 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -53,8 +53,6 @@ typedef enum
PT_REQUESTFILE, // Client requests a file transfer
PT_ASKINFOVIAMS, // Packet from the MS requesting info be sent to new client.
// If this ID changes, update masterserver definition.
- PT_RESYNCHEND, // Player is now resynched and is being requested to remake the gametic
- PT_RESYNCHGET, // Player got resynch packet
// Add non-PT_CANFAIL packet types here to avoid breaking MS compatibility.
@@ -68,8 +66,6 @@ typedef enum
PT_TEXTCMD2, // Splitscreen text commands.
PT_CLIENTJOIN, // Client wants to join; used in start game.
PT_NODETIMEOUT, // Packet sent to self if the connection times out.
- PT_RESYNCHING, // Packet sent to resync players.
- // Blocks game advance until synched.
#ifdef NEWPING
PT_PING, // Packet sent to tell clients the other client's latency to server.
#endif
@@ -113,147 +109,6 @@ typedef struct
ticcmd_t cmds[45]; // normally [BACKUPTIC][MAXPLAYERS] but too large
} ATTRPACK servertics_pak;
-// sent to client when all consistency data
-// for players has been restored
-typedef struct
-{
- UINT32 randomseed;
-
- //ctf flag stuff
- SINT8 flagplayer[2];
- INT32 flagloose[2];
- INT32 flagflags[2];
- fixed_t flagx[2];
- fixed_t flagy[2];
- fixed_t flagz[2];
-
- UINT32 ingame; // spectator bit for each player
- UINT32 ctfteam; // if not spectator, then which team?
-
- // Resynch game scores and the like all at once
- UINT32 score[MAXPLAYERS]; // Everyone's score.
- INT16 numboxes[MAXPLAYERS];
- INT16 totalring[MAXPLAYERS];
- tic_t realtime[MAXPLAYERS];
- UINT8 laps[MAXPLAYERS];
-} ATTRPACK resynchend_pak;
-
-typedef struct
-{
- //player stuff
- UINT8 playernum;
-
- // Do not send anything visual related.
- // Only send data that we need to know for physics.
- UINT8 playerstate; //playerstate_t
- UINT32 pflags; //pflags_t
- UINT8 panim; //panim_t
-
- angle_t aiming;
- INT32 currentweapon;
- INT32 ringweapons;
- UINT16 powers[NUMPOWERS];
-
- // Score is resynched in the confirm resync packet
- INT32 health;
- SINT8 lives;
- SINT8 continues;
- UINT8 scoreadd;
- SINT8 xtralife;
- SINT8 pity;
-
- UINT8 skincolor;
- INT32 skin;
- // Just in case Lua does something like
- // modify these at runtime
- fixed_t normalspeed;
- fixed_t runspeed;
- UINT8 thrustfactor;
- UINT8 accelstart;
- UINT8 acceleration;
- UINT8 charability;
- UINT8 charability2;
- UINT32 charflags;
- UINT32 thokitem; //mobjtype_t
- UINT32 spinitem; //mobjtype_t
- UINT32 revitem; //mobjtype_t
- INT32 actionspd;
- INT32 mindash;
- INT32 maxdash;
- fixed_t jumpfactor;
-
- fixed_t speed;
- UINT8 jumping;
- UINT8 secondjump;
- UINT8 fly1;
- tic_t glidetime;
- UINT8 climbing;
- INT32 deadtimer;
- tic_t exiting;
- UINT8 homing;
- fixed_t cmomx;
- fixed_t cmomy;
- fixed_t rmomx;
- fixed_t rmomy;
-
- INT32 weapondelay;
- INT32 tossdelay;
-
- INT16 starpostx;
- INT16 starposty;
- INT16 starpostz;
- INT32 starpostnum;
- tic_t starposttime;
- angle_t starpostangle;
-
- INT32 maxlink;
- fixed_t dashspeed;
- INT32 dashtime;
- angle_t angle_pos;
- angle_t old_angle_pos;
- tic_t bumpertime;
- INT32 flyangle;
- tic_t drilltimer;
- INT32 linkcount;
- tic_t linktimer;
- INT32 anotherflyangle;
- tic_t nightstime;
- INT32 drillmeter;
- UINT8 drilldelay;
- UINT8 bonustime;
- UINT8 mare;
- INT16 lastsidehit, lastlinehit;
-
- tic_t losstime;
- UINT8 timeshit;
- INT32 onconveyor;
-
- //player->mo stuff
- UINT8 hasmo; //boolean
-
- angle_t angle;
- fixed_t x;
- fixed_t y;
- fixed_t z;
- fixed_t momx;
- fixed_t momy;
- fixed_t momz;
- fixed_t friction;
- fixed_t movefactor;
-
- INT16 tics;
- statenum_t statenum;
- UINT32 flags;
- UINT32 flags2;
- UINT8 eflags;
-
- fixed_t radius;
- fixed_t height;
- fixed_t scale;
- fixed_t destscale;
- fixed_t scalespeed;
-} ATTRPACK resynch_pak;
-
typedef struct
{
UINT8 version; // different versions don't work
@@ -382,9 +237,6 @@ typedef struct
client2cmd_pak client2pak; // 200 bytes
servertics_pak serverpak; // 132495 bytes
serverconfig_pak servercfg; // 773 bytes
- resynchend_pak resynchend; //
- resynch_pak resynchpak; //
- UINT8 resynchgot; //
UINT8 textcmd[MAXTEXTCMD+1]; // 66049 bytes
filetx_pak filetxpak; // 139 bytes
clientconfig_pak clientcfg; // 136 bytes
@@ -449,7 +301,7 @@ extern UINT32 realpingtable[MAXPLAYERS];
extern UINT32 playerpingtable[MAXPLAYERS];
#endif
-extern consvar_t cv_joinnextround, cv_allownewplayer, cv_maxplayers, cv_resynchattempts, cv_blamecfail, cv_maxsend;
+extern consvar_t cv_joinnextround, cv_allownewplayer, cv_maxplayers, cv_blamecfail, cv_maxsend;
// used in d_net, the only dependence
tic_t ExpandTics(INT32 low);
@@ -503,5 +355,4 @@ void D_ResetTiccmds(void);
tic_t GetLag(INT32 node);
UINT8 GetFreeXCmdSize(void);
-extern UINT8 hu_resynching;
#endif
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 80e30beb5d54e0e7530604624f0a9a53c7657405..a5c4bb236c6fe3f094b1a3ee81358eea870d8263 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -1098,10 +1098,6 @@ void HU_Drawer(void)
if (!automapactive && cv_crosshair2.value && !demoplayback && !camera2.chase && !players[secondarydisplayplayer].spectator)
HU_DrawCrosshair2();
-
- // draw desynch text
- if (hu_resynching)
- V_DrawCenteredString(BASEVIDWIDTH/2, 180, V_YELLOWMAP, "Resynching...");
}
//======================================================================
diff --git a/src/m_menu.c b/src/m_menu.c
index 88893b3c6d98ed24d168813df17fd8e7c74a3530..45b8d6f1a67136bbdcd849ce1e9b794b4febecb0 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -1323,7 +1323,6 @@ static menuitem_t OP_ServerOptionsMenu[] =
{IT_STRING | IT_CVAR, NULL, "Max Players", &cv_maxplayers, 110},
{IT_STRING | IT_CVAR, NULL, "Allow players to join", &cv_allownewplayer, 120},
{IT_STRING | IT_CVAR, NULL, "Allow WAD Downloading", &cv_downloading, 130},
- {IT_STRING | IT_CVAR, NULL, "Attempts to Resynch", &cv_resynchattempts, 140},
#endif
};