- removed most of the network code in Blood.

Mainly to expose the parts that still get used in single player because there's some problems here that need addressing.
ENet is also gone now.

source/CMakeLists.txt

@@ -766,7 +766,6 @@ set (PCH_SOURCES
 	thirdparty/src/base64.cpp
 	thirdparty/src/fix16.cpp
 	thirdparty/src/md4.cpp
-	thirdparty/src/enet.cpp
 
 	# Todo: Split out the license-safe code from this.
 	build/src/animvpx.cpp

source/blood/src/blood.cpp

@@ -525,7 +525,7 @@ void StartLevel(GAMEOPTIONS *gameOptions)
     if (!bVanilla && !gMe->packSlots[1].isActive) // if diving suit is not active, turn off reverb sound effect
         sfxSetReverb(0);
     ambInit();
-    sub_79760();
+    netReset();
     gFrame = 0;
     gChokeCounter = 0;
 	M_ClearMenus();
@@ -557,12 +557,14 @@ void ProcessFrame(void)
         gPlayer[i].input.q16mlook = gFifoInput[gNetFifoTail&255][i].q16mlook;
     }
     gNetFifoTail++;
+#if 0
     if (!(gFrame&7))
     {
         CalcGameChecksum();
         memcpy(gCheckFifo[gCheckHead[myconnectindex]&255][myconnectindex], gChecksum, sizeof(gChecksum));
         gCheckHead[myconnectindex]++;
     }
+#endif
     for (int i = connecthead; i >= 0; i = connectpoint2[i])
     {
         if (gPlayer[i].input.keyFlags.quit)
@@ -797,7 +799,7 @@ static void app_init()
 static void gameInit()
 {
 //RESTART:
-    sub_79760();
+    netReset();
     gViewIndex = myconnectindex;
     gMe = gView = &gPlayer[myconnectindex];
     netBroadcastPlayerInfo(myconnectindex);
@@ -848,7 +850,6 @@ static void gameTicker()
                     break;
             if (i >= 0)
                 break;
-            //faketimerhandler();
             ProcessFrame();
             gameUpdate = true;
         }

source/blood/src/controls.cpp

@@ -36,6 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "view.h"
 #include "d_event.h"
 #include "gamestate.h"
+#include "sound.h"
 
 BEGIN_BLD_NS
 
@@ -119,7 +120,8 @@ void LocalKeys(void)
             char fk = key - sc_F1;
             if (alt)
             {
-                netBroadcastTaunt(myconnectindex, fk);
+                sndStartSample(4400 + fk, 128, 1, 0);
+                //netBroadcastTaunt(myconnectindex, fk);
             }
             else
             {

source/blood/src/messages.cpp

@@ -331,7 +331,7 @@ void CPlayerMsg::Send(void)
 {
     if (VanillaMode() || !IsWhitespaceOnly(text))
     {
-        netBroadcastMessage(myconnectindex, text);
+        //netBroadcastMessage(myconnectindex, text);
         if (!VanillaMode())
         {
             char *myName = gProfile[myconnectindex].name;

source/blood/src/network.h

@@ -138,13 +138,10 @@ inline void GetPacketBuffer(char *&p, void *pBuffer, int size)
     p += size;
 }
 
-void sub_79760(void);
+void netReset(void);
 void netResetToSinglePlayer(void);
-void netBroadcastMessage(int nPlayer, const char *pzMessage);
 void netWaitForEveryone(char a1);
-void sub_7AC28(const char *pzString);
 void netGetPackets(void);
-void netBroadcastTaunt(int nPlayer, int nTaunt);
 void CalcGameChecksum(void);
 void netBroadcastPlayerLogoff(int nPlayer);
 void netBroadcastMyLogoff(bool bRestart);
@@ -154,7 +151,6 @@ void netCheckSync(void);
 void netMasterUpdate(void);
 void netGetInput(void);
 void netPlayerQuit(int nPlayer);
-void netUpdate(void);
 void netDeinitialize(void);
 void netBroadcastNewGame(void);
 

source/blood/src/player.cpp

@@ -957,13 +957,6 @@ char PickupItem(PLAYER *pPlayer, spritetype *pItem) {
                         sprintf(buffer, "%s captured Red Flag!", gProfile[pPlayer->nPlayer].name);
                         sndStartSample(8001, 255, 2, 0);
                         viewSetMessage(buffer);
-#if 0
-                        if (dword_28E3D4 == 3 && myconnectindex == connecthead)
-                        {
-                            sprintf(buffer, "frag A killed B\n");
-                            sub_7AC28(buffer);
-                        }
-#endif
                     }
                 }
 
@@ -1001,13 +994,6 @@ char PickupItem(PLAYER *pPlayer, spritetype *pItem) {
                         sprintf(buffer, "%s captured Blue Flag!", gProfile[pPlayer->nPlayer].name);
                         sndStartSample(8000, 255, 2, 0);
                         viewSetMessage(buffer);
-#if 0
-                        if (dword_28E3D4 == 3 && myconnectindex == connecthead)
-                        {
-                            sprintf(buffer, "frag B killed A\n");
-                            sub_7AC28(buffer);
-                        }
-#endif
                     }
                 }
             }
@@ -1842,12 +1828,6 @@ void playerFrag(PLAYER *pKiller, PLAYER *pVictim)
     dassert(nKiller >= 0 && nKiller < kMaxPlayers);
     int nVictim = pVictim->pSprite->type-kDudePlayer1;
     dassert(nVictim >= 0 && nVictim < kMaxPlayers);
-    if (myconnectindex == connecthead)
-    {
-        sprintf(buffer, "frag %d killed %d\n", pKiller->nPlayer+1, pVictim->nPlayer+1);
-        sub_7AC28(buffer);
-        buffer[0] = 0;
-    }
     if (nKiller == nVictim)
     {
         pVictim->fraggerId = -1;

source/core/gamecontrol.cpp

@@ -113,8 +113,6 @@ int ShowStartupWindow(TArray<GrpEntry> &);
 FString GetGameFronUserFiles();
 void InitFileSystem(TArray<GrpEntry>&);
 void I_SetWindowTitle(const char* caption);
-void InitENet();
-void ShutdownENet();
 void S_ParseSndInfo();
 void I_DetectOS(void);
 void LoadScripts();
@@ -548,7 +546,6 @@ int GameMain()
 		delete gi;
 		gi = nullptr;
 	}
-	InitENet();
 	DeleteStartupScreen();
 	PClass::StaticShutdown();
 	if (Args) delete Args;
@@ -763,7 +760,6 @@ int RunGame()
 	I_DetectOS();
 	userConfig.ProcessOptions();
 	G_LoadConfig();
-	ShutdownENet();
 	auto usedgroups = SetupGame();
 
 

source/thirdparty/src/enet.cpp

@@ -1,18 +0,0 @@
-#define ENET_IMPLEMENTATION
-#include "enet.h"
-#include "printf.h"
-
-bool gHaveNetworking;
-
-void ShutdownENet()
-{
-	if (gHaveNetworking) enet_deinitialize();
-}
-
-void InitENet()
-{
-	gHaveNetworking = !enet_initialize();
-	if (!gHaveNetworking)
-		Printf("An error occurred while initializing ENet.\n");
-}
-