diff --git a/src/netcode/i_tcp.c b/src/netcode/i_tcp.c index 4c3d58ee2d406f9c29f5659e07fc45c3de7cb515..256d9992eff6acdd614ac9bf99428e459884fe2a 100644 --- a/src/netcode/i_tcp.c +++ b/src/netcode/i_tcp.c @@ -1152,11 +1152,7 @@ static SINT8 SOCK_NetMakeNodewPort(const char *address, const char *port) // test ip address of server for (i = 0; i < mysocketses; ++i) { - /* sendto tests that there is a network to this - address */ - if (runp->ai_addr->sa_family == myfamily[i] && - sendto(mysockets[i], NULL, 0, 0, - runp->ai_addr, runp->ai_addrlen) == 0) + if (runp->ai_addr->sa_family == myfamily[i]) { memcpy(&clientaddress[newnode], runp->ai_addr, runp->ai_addrlen); break; diff --git a/src/w_wad.c b/src/w_wad.c index 4a1d44548b75b801343cd60a81f8c80bec7bcf17..6964f24aa2d5865fbc69be661880fff4b32aa5d7 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -307,12 +307,10 @@ static void W_LoadDehackedLumps(UINT16 wadnum, boolean mainfile) * \param resblock resulting MD5 checksum * \return 0 if MD5 checksum was made, and is at resblock, 1 if error was found */ + +#ifndef NOMD5 static INT32 W_MakeFileMD5(const char *filename, void *resblock) { -#ifdef NOMD5 - (void)filename; - memset(resblock, 0x00, 16); -#else FILE *fhandle; if ((fhandle = fopen(filename, "rb")) != NULL) @@ -329,9 +327,9 @@ static INT32 W_MakeFileMD5(const char *filename, void *resblock) fclose(fhandle); return 0; } -#endif return 1; } +#endif // Invalidates the cache of lump numbers. Call this whenever a wad is added. static void W_InvalidateLumpnumCache(void)