From b8d2d626caf10825d24268ce48b3321dcdc3fc80 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 4 Sep 2020 20:48:29 +0200 Subject: [PATCH] - cleaned out some leftover network variables --- source/sw/src/d_menu.cpp | 2 -- source/sw/src/game.cpp | 3 +-- source/sw/src/game.h | 6 ------ source/sw/src/network.cpp | 6 ------ source/sw/src/save.cpp | 1 - 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/source/sw/src/d_menu.cpp b/source/sw/src/d_menu.cpp index c626821d8..aacc6b222 100644 --- a/source/sw/src/d_menu.cpp +++ b/source/sw/src/d_menu.cpp @@ -203,8 +203,6 @@ void GameInterface::StartGame(FNewGameStartup& gs) // always assumed that a demo is playing - ready2send = 0; - MapRecord* map; if (gs.Episode >= 1) map = FindMapByLevelNum(5); diff --git a/source/sw/src/game.cpp b/source/sw/src/game.cpp index 5441c4163..a7295696e 100644 --- a/source/sw/src/game.cpp +++ b/source/sw/src/game.cpp @@ -144,7 +144,6 @@ SWBOOL ExitLevel = false; int OrigCommPlayers=0; extern uint8_t CommPlayers; extern SWBOOL CommEnabled; -extern int bufferjitter; SWBOOL CameraTestMode = false; @@ -473,7 +472,7 @@ void InitRunLevel(void) // send packets with player info InitNetPlayerOptions(); - // Initialize Game part of network code (When ready2send != 0) + // Initialize Game part of network code InitNetVars(); if (currentLevel) diff --git a/source/sw/src/game.h b/source/sw/src/game.h index 8e9f4763f..a7f41dfc8 100644 --- a/source/sw/src/game.h +++ b/source/sw/src/game.h @@ -2047,13 +2047,7 @@ extern USER puser[MAX_SW_PLAYERS_REG]; // /////////////////////////// -extern int gotlastpacketclock; -extern SWBOOL ready2send; extern double smoothratio; - -// local copy of variables updated by faketimerhandler -extern int locselectedgun; - extern SWBOOL MoveSkip4, MoveSkip2, MoveSkip8; #define MASTER_SWITCHING 1 diff --git a/source/sw/src/network.cpp b/source/sw/src/network.cpp index 112f402f1..4c8d62e4d 100644 --- a/source/sw/src/network.cpp +++ b/source/sw/src/network.cpp @@ -56,15 +56,9 @@ gNET gNet; //Local multiplayer variables // should move this to a local scope of faketimerhandler - do it when able to test -//InputPacket oloc; - -SWBOOL ready2send = 0; - SWBOOL CommEnabled = FALSE; uint8_t CommPlayers = 0; -int bufferjitter = 1; - double smoothratio; // must start out as 0 diff --git a/source/sw/src/save.cpp b/source/sw/src/save.cpp index 4b903ef79..3dd664349 100644 --- a/source/sw/src/save.cpp +++ b/source/sw/src/save.cpp @@ -1089,7 +1089,6 @@ bool GameInterface::LoadGame(FSaveGameNode* sv) DoPlayerNightVisionPalette(Player+myconnectindex); SavegameLoaded = TRUE; - ready2send = 1; return true; }