From cd30f0e933cbeb0a2ede18e503d3d3849741a39f Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 26 Apr 2020 20:46:33 -0700 Subject: [PATCH 1/2] Match MAXSERVERLIST to MAXNETNODES, increase MAXNETNODES Each server in the server list requires a node. It's also MAXNETNODES-1 because the first node is yourself. (cherry picked from commit 1484f0484f6c22382b2cae955a93c01f83d54655) --- src/d_clisrv.h | 3 ++- src/d_net.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/d_clisrv.h b/src/d_clisrv.h index d537984df..60967f6cf 100644 --- a/src/d_clisrv.h +++ b/src/d_clisrv.h @@ -14,6 +14,7 @@ #define __D_CLISRV__ #include "d_ticcmd.h" +#include "d_net.h" #include "d_netcmd.h" #include "d_net.h" #include "tables.h" @@ -483,7 +484,7 @@ typedef struct #pragma pack() #endif -#define MAXSERVERLIST 64 // Depends only on the display +#define MAXSERVERLIST (MAXNETNODES-1) typedef struct { SINT8 node; diff --git a/src/d_net.h b/src/d_net.h index ed4f66284..4ada32344 100644 --- a/src/d_net.h +++ b/src/d_net.h @@ -19,7 +19,7 @@ #define __D_NET__ // Max computers in a game -#define MAXNETNODES (MAXPLAYERS+4) +#define MAXNETNODES 64 #define BROADCASTADDR MAXNETNODES #define MAXSPLITSCREENPLAYERS 2 // Max number of players on a single computer //#define NETSPLITSCREEN // Kart's splitscreen netgame feature From 0af38bc5eb1ca8ed904f632975e737ccd16167f0 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 9 Aug 2020 18:26:13 -0700 Subject: [PATCH 2/2] Bump MAXNETNODES to 127 (cherry picked from commit 9d9f8fd8a337a1786efa0d348c89e05b26ce8571) --- src/d_net.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/d_net.h b/src/d_net.h index 4ada32344..ea6b5d4d9 100644 --- a/src/d_net.h +++ b/src/d_net.h @@ -19,7 +19,9 @@ #define __D_NET__ // Max computers in a game -#define MAXNETNODES 64 +// 127 is probably as high as this can go, because +// SINT8 is used for nodes sometimes >:( +#define MAXNETNODES 127 #define BROADCASTADDR MAXNETNODES #define MAXSPLITSCREENPLAYERS 2 // Max number of players on a single computer //#define NETSPLITSCREEN // Kart's splitscreen netgame feature