diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 6adaae1917449386c3561ac1905eec3c3902cd09..312a308a101b76acc66a3459b540e7db48922af5 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1733,9 +1733,7 @@ static boolean CL_ServerConnectionSearchTicker(boolean viams, tic_t *asksent)
{
#ifndef NONET
INT32 i;
-#endif
-#ifndef NONET
// serverlist is updated by GetPacket function
if (serverlistcount > 0)
{
@@ -1769,7 +1767,20 @@ static boolean CL_ServerConnectionSearchTicker(boolean viams, tic_t *asksent)
serverlist[i].info.fileneeded);
CONS_Printf(M_GetText("Checking files...\n"));
i = CL_CheckFiles();
- if (i == 2) // cannot join for some reason
+ if (i == 3) // too many files
+ {
+ D_QuitNetGame();
+ CL_Reset();
+ D_StartTitle();
+ M_StartMessage(M_GetText(
+ "You have too many WAD files loaded\n"
+ "to add ones the server is using.\n"
+ "Please restart SRB2 before connecting.\n\n"
+ "Press ESC\n"
+ ), NULL, MM_NOTHING);
+ return false;
+ }
+ else if (i == 2) // cannot join for some reason
{
D_QuitNetGame();
CL_Reset();
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index f23549315919f432e8ca5a73f7aa9bc50b110860..b5563f4e89f78be595cf7398ee30c242c8474584 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -3083,7 +3083,13 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
filestatus_t ncs = FS_NOTFOUND;
UINT8 md5sum[16];
boolean kick = false;
+ boolean toomany = false;
INT32 i;
+ size_t packetsize = 0;
+ serverinfo_pak *dummycheck = NULL;
+
+ // Shut the compiler up.
+ (void)dummycheck;
READSTRINGN(*cp, filename, 240);
READMEM(*cp, md5sum, 16);
@@ -3109,13 +3115,25 @@ static void Got_RequestAddfilecmd(UINT8 **cp, INT32 playernum)
return;
}
- ncs = findfile(filename,md5sum,true);
+ // See W_LoadWadFile in w_wad.c
+ for (i = 0; i < numwadfiles; i++)
+ packetsize += nameonlylength(wadfiles[i]->filename) + 22;
- if (ncs != FS_FOUND)
+ packetsize += nameonlylength(filename) + 22;
+
+ if ((numwadfiles >= MAX_WADFILES)
+ || (packetsize > sizeof(dummycheck->fileneeded)))
+ toomany = true;
+ else
+ ncs = findfile(filename,md5sum,true);
+
+ if (ncs != FS_FOUND || toomany)
{
char message[256];
- if (ncs == FS_NOTFOUND)
+ if (toomany)
+ sprintf(message, M_GetText("Too many files loaded to add %s\n"), filename);
+ else if (ncs == FS_NOTFOUND)
sprintf(message, M_GetText("The server doesn't have %s\n"), filename);
else if (ncs == FS_MD5SUMBAD)
sprintf(message, M_GetText("Checksum mismatch on %s\n"), filename);
@@ -3185,10 +3203,15 @@ static void Got_Addfilecmd(UINT8 **cp, INT32 playernum)
ncs = findfile(filename,md5sum,true);
- if (ncs != FS_FOUND)
+ if (ncs != FS_FOUND || !P_AddWadFile(filename, NULL))
{
Command_ExitGame_f();
- if (ncs == FS_NOTFOUND)
+ if (ncs == FS_FOUND)
+ {
+ CONS_Printf(M_GetText("The server tried to add %s,\nbut you have too many files added.\nRestart the game to clear loaded files\nand play on this server."), filename);
+ M_StartMessage(va("The server added a file \n(%s)\nbut you have too many files added.\nRestart the game to clear loaded files.\n\nPress ESC\n",filename), NULL, MM_NOTHING);
+ }
+ else if (ncs == FS_NOTFOUND)
{
CONS_Printf(M_GetText("The server tried to add %s,\nbut you don't have this file.\nYou need to find it in order\nto play on this server."), filename);
M_StartMessage(va("The server added a file \n(%s)\nthat you do not have.\n\nPress ESC\n",filename), NULL, MM_NOTHING);
@@ -3206,7 +3229,6 @@ static void Got_Addfilecmd(UINT8 **cp, INT32 playernum)
return;
}
- P_AddWadFile(filename, NULL);
G_SetGameModified(true);
}
diff --git a/src/d_netfil.c b/src/d_netfil.c
index 2c463c0b5b44e991d4d4dcc0d709e77a26f319a1..172624ad297a753c43abf0e348c3a6df07d8c1f6 100644
--- a/src/d_netfil.c
+++ b/src/d_netfil.c
@@ -337,6 +337,12 @@ INT32 CL_CheckFiles(void)
INT32 i, j;
char wadfilename[MAX_WADPATH];
INT32 ret = 1;
+ size_t packetsize = 0;
+ size_t filestoget = 0;
+ serverinfo_pak *dummycheck = NULL;
+
+ // Shut the compiler up.
+ (void)dummycheck;
// if (M_CheckParm("-nofiles"))
// return 1;
@@ -385,6 +391,10 @@ INT32 CL_CheckFiles(void)
return 1;
}
+ // See W_LoadWadFile in w_wad.c
+ for (i = 0; i < numwadfiles; i++)
+ packetsize += nameonlylength(wadfiles[i]->filename) + 22;
+
for (i = 1; i < fileneedednum; i++)
{
CONS_Debug(DBG_NETPLAY, "searching for '%s' ", fileneeded[i].filename);
@@ -404,6 +414,14 @@ INT32 CL_CheckFiles(void)
if (fileneeded[i].status != FS_NOTFOUND || !fileneeded[i].important)
continue;
+ packetsize += nameonlylength(fileneeded[i].filename) + 22;
+
+ if ((numwadfiles+filestoget >= MAX_WADFILES)
+ || (packetsize > sizeof(dummycheck->fileneeded)))
+ return 3;
+
+ filestoget++;
+
fileneeded[i].status = findfile(fileneeded[i].filename, fileneeded[i].md5sum, true);
CONS_Debug(DBG_NETPLAY, "found %d\n", fileneeded[i].status);
if (fileneeded[i].status != FS_FOUND)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index fb8648013fbecd1527dbdc22d70cd806a7202984..9fdbc37fb848a33c401d02f518c0fe76d5888a0f 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -2363,7 +2363,7 @@ static boolean P_ZMovement(mobj_t *mo)
mo->z = mo->floorz;
#ifdef ESLOPE
- if (mo->standingslope) // You're still on the ground; why are we here?
+ if (!(mo->flags & MF_MISSILE) && mo->standingslope) // You're still on the ground; why are we here?
{
mo->momz = 0;
return true;
@@ -7807,6 +7807,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
break;
case MT_EGGCAPSULE:
mobj->extravalue1 = -1; // timer for how long a player has been at the capsule
+ break;
case MT_REDTEAMRING:
mobj->color = skincolor_redteam;
break;
diff --git a/src/r_data.c b/src/r_data.c
index 7bad6bb897b6e379d480de67d00bcf704b14a9a9..d19882dd395379abe81fe5e3924193cb4b2d3811 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -944,23 +944,24 @@ static void R_InitExtraColormaps(void)
for (cfile = clump = 0; cfile < numwadfiles; cfile++, clump = 0)
{
startnum = W_CheckNumForNamePwad("C_START", cfile, clump);
- if (startnum == LUMPERROR)
+ if (startnum == INT16_MAX)
continue;
endnum = W_CheckNumForNamePwad("C_END", cfile, clump);
- if (endnum == LUMPERROR)
+ if (endnum == INT16_MAX)
I_Error("R_InitExtraColormaps: C_START without C_END\n");
- if (WADFILENUM(startnum) != WADFILENUM(endnum))
- I_Error("R_InitExtraColormaps: C_START and C_END in different wad files!\n");
+ // This shouldn't be possible when you use the Pwad function, silly
+ //if (WADFILENUM(startnum) != WADFILENUM(endnum))
+ //I_Error("R_InitExtraColormaps: C_START and C_END in different wad files!\n");
if (numcolormaplumps >= maxcolormaplumps)
maxcolormaplumps *= 2;
colormaplumps = Z_Realloc(colormaplumps,
sizeof (*colormaplumps) * maxcolormaplumps, PU_STATIC, NULL);
- colormaplumps[numcolormaplumps].wadfile = WADFILENUM(startnum);
- colormaplumps[numcolormaplumps].firstlump = LUMPNUM(startnum+1);
+ colormaplumps[numcolormaplumps].wadfile = cfile;
+ colormaplumps[numcolormaplumps].firstlump = startnum+1;
colormaplumps[numcolormaplumps].numlumps = endnum - (startnum + 1);
numcolormaplumps++;
}