- removed ready2send variable.

It's a leftover from the old netcode.
This commit is contained in:
Christoph Oelckers 2020-08-31 20:25:08 +02:00
parent 678b8223a9
commit ac5abd8aac
7 changed files with 2 additions and 22 deletions

View file

@ -698,6 +698,7 @@ void ReadBindings(int lump, bool override)
sc.MustGetString(); sc.MustGetString();
} }
key = GetConfigKeyFromName(sc.String); key = GetConfigKeyFromName(sc.String);
assert(key);
sc.MustGetString(); sc.MustGetString();
dest->SetBind(key, sc.String, override); dest->SetBind(key, sc.String, override);
} }

View file

@ -55,7 +55,6 @@ static void dowarp(MapRecord *map)
if (ps[myconnectindex].gm & MODE_GAME) if (ps[myconnectindex].gm & MODE_GAME)
{ {
ready2send = 0;
donewgame(map, ud.m_player_skill); donewgame(map, ud.m_player_skill);
ps[myconnectindex].gm = MODE_RESTART; ps[myconnectindex].gm = MODE_RESTART;
} }

View file

@ -221,7 +221,6 @@ void GameInterface::MenuOpened()
{ {
if (ud.multimode < 2) if (ud.multimode < 2)
{ {
ready2send = 0;
screenpeek = myconnectindex; screenpeek = myconnectindex;
} }
} }
@ -255,16 +254,6 @@ void GameInterface::MenuSound(EMenuSounds snd)
void GameInterface::MenuClosed() void GameInterface::MenuClosed()
{ {
auto& gm = ps[myconnectindex].gm;
if (gm & MODE_GAME)
{
if (ud.multimode < 2 && ud.recstat != 2)
{
ready2send = 1;
cameraclock = INT_MIN;
cameradist = 65536;
}
}
} }
bool GameInterface::CanSave() bool GameInterface::CanSave()
@ -272,7 +261,7 @@ bool GameInterface::CanSave()
if (ud.recstat == 2 || gamestate != GS_LEVEL) return false; if (ud.recstat == 2 || gamestate != GS_LEVEL) return false;
auto &myplayer = ps[myconnectindex]; auto &myplayer = ps[myconnectindex];
return (sprite[myplayer.i].extra > 0); return (sprite[myplayer.i].extra > 0);
} }
void GameInterface::StartGame(FNewGameStartup& gs) void GameInterface::StartGame(FNewGameStartup& gs)
{ {

View file

@ -63,7 +63,6 @@ int16_t max_ammo_amount[MAX_WEAPONS];
int16_t weaponsandammosprites[15]; int16_t weaponsandammosprites[15];
int PHEIGHT = PHEIGHT_DUKE; int PHEIGHT = PHEIGHT_DUKE;
int duke3d_globalflags; int duke3d_globalflags;
uint8_t ready2send;
int playerswhenstarted; int playerswhenstarted;
int show_shareware; int show_shareware;
int screenpeek; int screenpeek;

View file

@ -51,7 +51,6 @@ extern int16_t max_ammo_amount[MAX_WEAPONS];
extern int16_t weaponsandammosprites[15]; extern int16_t weaponsandammosprites[15];
extern int32_t PHEIGHT; extern int32_t PHEIGHT;
extern int duke3d_globalflags; extern int duke3d_globalflags;
extern uint8_t ready2send;
extern int playerswhenstarted; extern int playerswhenstarted;
extern int show_shareware; extern int show_shareware;
extern int screenpeek; extern int screenpeek;

View file

@ -759,7 +759,6 @@ void resettimevars(void)
resetGameClock(); resetGameClock();
ud.levelclock = 0; ud.levelclock = 0;
levelTextTime = 85; levelTextTime = 85;
ready2send = 1;
if (camsprite >= 0) if (camsprite >= 0)
hittype[camsprite].temp_data[0] = 0; hittype[camsprite].temp_data[0] = 0;
} }
@ -839,8 +838,6 @@ void donewgame(MapRecord* map, int sk)
template<class func> template<class func>
void newgame(MapRecord* map, int sk, func completion) void newgame(MapRecord* map, int sk, func completion)
{ {
ready2send = 0;
auto completion1 = [=](bool res) auto completion1 = [=](bool res)
{ {
if (!isRR() && map->levelNumber == levelnum(3, 0) && (ud.multimode < 2)) if (!isRR() && map->levelNumber == levelnum(3, 0) && (ud.multimode < 2))
@ -1102,8 +1099,6 @@ bool setnextmap(bool checksecretexit)
int exitlevelend() int exitlevelend()
{ {
ready2send = 0;
if (numplayers > 1) if (numplayers > 1)
ps[myconnectindex].gm = MODE_GAME; ps[myconnectindex].gm = MODE_GAME;
@ -1126,7 +1121,6 @@ void exitlevel(void)
if (ps[myconnectindex].gm & MODE_EOL) if (ps[myconnectindex].gm & MODE_EOL)
{ {
ready2send = 0;
dobonus(0, [=](bool) dobonus(0, [=](bool)
{ {

View file

@ -536,7 +536,6 @@ void GameInterface::SerializeGameState(FSerializer& arc)
FX_SetReverb(0); FX_SetReverb(0);
} }
ready2send = 1;
} }
} }