add mobj islocal field

so we can skip the pushable trigger stuff for local mobjs for synch reasons
very sketchy

src/d_clisrv.h

@@ -42,8 +42,8 @@ applications may follow different packet versions.
 #define VANILLA_GT_MATCH 3
 
 // Networking and tick handling related.
-#define BACKUPTICS 512 // more than enough for most timeouts....
-#define CLIENTBACKUPTICS 32
+#define BACKUPTICS 32
+#define TICQUEUE 512 // more than enough for most timeouts....
 #define MAXTEXTCMD 256
 
 // No. of tics your controls can be delayed by.
@@ -533,6 +533,7 @@ extern UINT32 serverlistultimatecount;
 extern INT32 mapchangepending;
 
 // Points inside doomcom
+extern doomdata_t *netbuffer;
 extern consvar_t cv_stunserver;
 extern consvar_t cv_httpsource;
 extern consvar_t cv_kicktime;

src/d_main.c

@@ -898,14 +898,13 @@ void D_SRB2Loop(void)
 			rendertimefrac_unpaused = FRACUNIT;
 		}
 
-
 		if (interp || doDisplay)
 		{
 			if (!frameskip)
 			{
 				ranwipe = D_Display();
 			}
-			else if (frameskip)
+			else if (!dedicated)
 			{
 				// always update console and hud
 				// otherwise it may take minutes to open it

src/d_net.c

@@ -48,6 +48,12 @@ tic_t connectiontimeout = (10*TICRATE);
 
 /// \brief network packet
 doomcom_t *doomcom = NULL;
+/// \brief network packet data, points inside doomcom
+doomdata_t *netbuffer = NULL;
+/// \brief hole punching packet, also points inside doomcom
+#ifdef HOLEPUNCH
+holepunch_t *holepunchpacket = NULL;
+#endif
 
 #ifdef DEBUGFILE
 FILE *debugfile = NULL; // put some net info in a file during the game
@@ -203,9 +209,13 @@ static node_t nodes[MAXNETNODES];
 //         0 if a = n (mod 256)
 //        >0 if a > b (mod 256)
 // mnemonic: to use it compare to 0: cmpack(a,b)<0 is "a < b" ...
-FUNCMATH static inline INT32 cmpack(UINT8 a, UINT8 b)
+FUNCMATH static INT32 cmpack(UINT8 a, UINT8 b)
 {
-	return (SINT8)(a - b);
+	register INT32 d = a - b;
+
+	if (d >= 127 || d < -128)
+		return -d;
+	return d;
 }
 
 /** Sets freeack to a free acknum and copies the netbuffer in the ackpak table
@@ -219,8 +229,6 @@ static boolean GetFreeAcknum(UINT8 *freeack)
 	node_t *node = &nodes[doomcom->remotenode];
 	INT32 i, numfreeslot = 0;
 
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
-
 	if (cmpack((UINT8)((node->remotefirstack + MAXACKTOSEND) % 256), node->nextacknum) < 0)
 	{
 		DEBFILE(va("too fast %d %d\n",node->remotefirstack,node->nextacknum));
@@ -290,7 +298,6 @@ static boolean Processackpak(void)
 	INT32 i;
 	boolean goodpacket = true;
 	node_t *node = &nodes[doomcom->remotenode];
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 	// Received an ack return, so remove the ack in the list
 	if (netbuffer->ackreturn && cmpack(node->remotefirstack, netbuffer->ackreturn) < 0)
@@ -300,7 +307,7 @@ static boolean Processackpak(void)
 		// Search the ackbuffer and free it
 		for (i = 0; i < MAXACKPACKETS; i++)
 		{
-			if (ackpak[i].acknum && ackpak[i].destinationnode == doomcom->remotenode
+			if (ackpak[i].acknum && ackpak[i].destinationnode == node - nodes
 				&& cmpack(ackpak[i].acknum, netbuffer->ackreturn) <= 0)
 			{
 				RemoveAck(i);
@@ -416,7 +423,6 @@ void Net_SendAcks(INT32 node)
 #ifdef NONET
 	(void)node;
 #else
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	netbuffer->packettype = PT_NOTHING;
 	M_Memcpy(netbuffer->u.textcmd, nodes[node].acktosend, MAXACKTOSEND);
 	HSendPacket(node, false, 0, MAXACKTOSEND);
@@ -428,8 +434,6 @@ static void GotAcks(void)
 {
 	INT32 i, j;
 
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
-
 	for (j = 0; j < MAXACKTOSEND; j++)
 	{
 		if (netbuffer->u.textcmd[j])
@@ -483,8 +487,6 @@ void Net_AckTicker(void)
 #ifndef NONET
 	INT32 i;
 
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
-
 	for (i = 0; i < MAXACKPACKETS; i++)
 	{
 		const INT32 nodei = ackpak[i].destinationnode;
@@ -540,7 +542,6 @@ void Net_UnAcknowledgePacket(INT32 node)
 #ifdef NONET
 	(void)node;
 #else
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	INT32 hm1 = (nodes[node].acktosend_head-1+MAXACKTOSEND) % MAXACKTOSEND;
 	DEBFILE(va("UnAcknowledge node %d\n", node));
 
@@ -735,7 +736,6 @@ void Net_CloseConnection(INT32 node)
 //
 static UINT32 NetbufferChecksum(void)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	UINT32 c = 0x1234567;
 	const INT32 l = doomcom->datalength - 4;
 	const UINT8 *buf = (UINT8 *)netbuffer + 4;
@@ -852,8 +852,6 @@ const char *Net_GetPacketName(UINT8 packettype)
 
 static void DebugPrintpacket(const char *header)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
-
 	fprintf(debugfile, "%-12s (node %d,ack %d,ackret %d,size %d) type(%d) : %s\n",
 		header, doomcom->remotenode, netbuffer->ack, netbuffer->ackreturn, doomcom->datalength,
 		netbuffer->packettype, Net_GetPacketName(netbuffer->packettype));
@@ -1023,7 +1021,6 @@ void Command_Droprate(void)
 #ifndef NONET
 static boolean ShouldDropPacket(void)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	return (packetdropquantity[netbuffer->packettype])
 		|| (packetdroprate != 0 && rand() < (((double)RAND_MAX) * (packetdroprate / 100.f))) || packetdroprate == 100;
 }
@@ -1035,7 +1032,6 @@ static boolean ShouldDropPacket(void)
 //
 boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlength)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	doomcom->datalength = (INT16)(packetlength + BASEPACKETSIZE);
 
 	if (node == 0) // Packet is to go back to us
@@ -1136,7 +1132,7 @@ boolean HSendPacket(INT32 node, boolean reliable, UINT8 acknum, size_t packetlen
 //
 boolean HGetPacket(void)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
+	//boolean nodejustjoined;
 
 	// Get a packet from self
 	if (rebound_tail != rebound_head)
@@ -1224,18 +1220,6 @@ static void Internal_FreeNodenum(INT32 nodenum)
 	(void)nodenum;
 }
 
-static char *I_NetSplitAddress(char *host, char **port)
-{
-	boolean v4 = (host[0] != '[');
-
-	host = strtok(host, v4 ? ":" : "[]");
-
-	if (port)
-		*port = strtok(NULL, ":");
-
-	return host;
-}
-
 SINT8 I_NetMakeNode(const char *hostname)
 {
 	SINT8 newnode = -1;
@@ -1243,14 +1227,20 @@ SINT8 I_NetMakeNode(const char *hostname)
 	if (I_NetMakeNodewPort)
 	{
 		char *localhostname = strdup(hostname);
-		char *port;
+		char  *t = localhostname;
+		const char *port;
 		if (!localhostname)
 			return newnode;
-
 		// retrieve portnum from address!
-		hostname = I_NetSplitAddress(localhostname, &port);
+		strtok(localhostname, ":");
+		port = strtok(NULL, ":");
 
-		newnode = I_NetMakeNodewPort(hostname, port);
+		// remove the port in the hostname as we've it already
+		while ((*t != ':') && (*t != '\0'))
+			t++;
+		*t = '\0';
+
+		newnode = I_NetMakeNodewPort(localhostname, port);
 		free(localhostname);
 	}
 	return newnode;
@@ -1342,6 +1332,11 @@ boolean D_CheckNetGame(void)
 	if (doomcom->numnodes > MAXNETNODES)
 		I_Error("Too many nodes (%d), max:%d", doomcom->numnodes, MAXNETNODES);
 
+	netbuffer = (doomdata_t *)(void *)&doomcom->data;
+#ifdef HOLEPUNCH
+	holepunchpacket = (holepunch_t *)(void *)&doomcom->data;
+#endif
+
 #ifdef DEBUGFILE
 	if (M_CheckParm("-debugfile"))
 	{

src/d_netfil.c

@@ -142,7 +142,6 @@ UINT8 *PutFileNeeded(UINT16 firstfile)
 {
 	size_t i;
 	UINT8 count = 0;
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	UINT8 *p_start = netbuffer->packettype == PT_MOREFILESNEEDED ? netbuffer->u.filesneededcfg.files : netbuffer->u.serverinfo.fileneeded;
 	UINT8 *p = p_start;
 	char wadfilename[MAX_WADPATH] = "";
@@ -324,7 +323,6 @@ boolean CL_SendRequestFile(void)
 #ifdef MORELEGACYDOWNLOADER
 	boolean firstloop = true;
 #endif
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 #ifdef PARANOIA
 	if (M_CheckParm("-nodownload"))
@@ -453,11 +451,9 @@ tryagain:
 // returns false if a requested file was not found or cannot be sent
 boolean Got_RequestFilePak(INT32 node)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	char wad[MAX_WADPATH+1];
 	UINT8 *p = netbuffer->u.textcmd;
 	UINT8 id;
-
 	while (p < netbuffer->u.textcmd + MAXTEXTCMD) // Don't allow hacked client to overflow
 	{
 		id = READUINT8(p);
@@ -821,7 +817,6 @@ void SV_FileSendTicker(void)
 	size_t size;
 	filetx_t *f;
 	INT32 packetsent, ram, i, j;
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 
 	if (!filestosend) // No file to send
 		return;
@@ -950,7 +945,6 @@ void SV_FileSendTicker(void)
 
 void Got_Filetxpak(void)
 {
-	doomdata_t *netbuffer = DOOMCOM_DATA(doomcom);
 	INT32 filenum = netbuffer->u.filetxpak.fileid;
 	fileneeded_t *file = &fileneeded[filenum];
 	char *filename = file->filename;

src/dedicated/i_video.c

@@ -152,3 +152,8 @@ boolean I_UseNativeKeyboard(void)
 {
 	return false;
 }
+
+void I_SetBorderlessWindow(void) 
+{
+
+}

src/doomdef.h

@@ -111,8 +111,8 @@ extern char  logfilename[1024];
 #else
 #define VERSION    1 // Game version
 #define SUBVERSION 6 // more precise version number
-#define VERSIONSTRING "Saturn v8.2"
-#define VERSIONSTRINGW L"Saturn v8.2"
+#define VERSIONSTRING "Saturn v8.3"
+#define VERSIONSTRINGW L"Saturn v8.3"
 // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
 // And change CMakeLists.txt (not src/, but in root), for CMake users!
 // AND appveyor.yml, for the build bots!

src/doomstat.h

@@ -575,7 +575,7 @@ extern consvar_t cv_downloading; // allow clients to downloading WADs.
 extern consvar_t cv_nettimeout; // SRB2Kart: Advanced server options menu
 extern consvar_t cv_jointimeout;
 extern consvar_t cv_maxping;
-extern ticcmd_t netcmds[BACKUPTICS][MAXPLAYERS];
+extern ticcmd_t netcmds[TICQUEUE][MAXPLAYERS];
 extern INT32 serverplayer;
 extern INT32 adminplayers[MAXPLAYERS];
 

src/g_game.c

@@ -109,7 +109,7 @@ boolean addedtogame;
 player_t players[MAXPLAYERS];
 
 INT32 consoleplayer; // player taking events and displaying
-INT32 displayplayers[MAXSPLITSCREENPLAYERS]; // view being displayed
+INT32 displayplayers[MAXSPLITSCREENPLAYERS] = {0}; // view being displayed
 
 tic_t gametic;
 tic_t levelstarttic; // gametic at level start
@@ -1787,7 +1787,7 @@ void G_Ticker(boolean run)
 		}
 	}
 
-	buf = gametic % BACKUPTICS;
+	buf = gametic % TICQUEUE;
 
 	if (!demo.playback)
 	{

src/http-mserv.c

@@ -220,11 +220,7 @@ HMS_connect (const char *format, ...)
 
 	curl_easy_setopt(curl, CURLOPT_URL, url);
 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-
-#ifdef HAVE_IPV6
-	if (!M_CheckParm("-ipv6"))
-#endif
-		curl_easy_setopt(curl, CURLOPT_IPRESOLVE, (long)CURL_IPRESOLVE_V4);
+	curl_easy_setopt(curl, CURLOPT_IPRESOLVE, (long)CURL_IPRESOLVE_V4);
 
 	curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)cv_masterserver_timeout.value);
 	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, HMS_on_read);

src/i_net.h

@@ -82,8 +82,6 @@ typedef struct
 	char data[MAXPACKETLENGTH];
 } ATTRPACK doomcom_t;
 
-#define DOOMCOM_DATA(d) (doomdata_t *)&(d)->data
-
 #ifdef HOLEPUNCH
 typedef struct
 {
@@ -91,8 +89,6 @@ typedef struct
 	INT32 addr;
 	INT16 port;
 } ATTRPACK holepunch_t;
-
-#define HOLEPUNCH_DATA(d) (holepunch_t *)&(d)->data
 #endif
 
 #if defined(_MSC_VER)
@@ -101,6 +97,10 @@ typedef struct
 
 extern doomcom_t *doomcom;
 
+#ifdef HOLEPUNCH
+extern holepunch_t *holepunchpacket;
+#endif
+
 /**	\brief return packet in doomcom struct
 */
 extern boolean (*I_NetGet)(void);

src/i_tcp.c

@@ -371,16 +371,8 @@ static inline void I_UPnP_rem(const char *port, const char * servicetype)
 
 static const char *SOCK_AddrToStr(mysockaddr_t *sk)
 {
-	static char s[64]; // 255.255.255.255:65535 or
-	// [ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]:65535
-
+	static char s[64]; // 255.255.255.255:65535 or IPv6:65535
 #ifdef HAVE_NTOP
-#ifdef HAVE_IPV6
-	int v6 = (sk->any.sa_family == AF_INET6);
-#else
-	int v6 = 0;
-#endif
-
 	void *addr;
 	int e = 0; // save error code so it can't be modified later code and avoid calling WSAGetLastError() more then once
 
@@ -395,20 +387,14 @@ static const char *SOCK_AddrToStr(mysockaddr_t *sk)
 
 	if(addr == NULL)
 		sprintf(s, "No address");
-	else if(inet_ntop(sk->any.sa_family, addr, &s[v6], sizeof (s) - v6) == NULL)
+	else if(inet_ntop(sk->any.sa_family, addr, s, sizeof (s)) == NULL)
 	{
 		e = errno;
 		sprintf(s, "Unknown family type, error #%u: %s", e, strerror(e));
 	}
 #ifdef HAVE_IPV6
-	else if(sk->any.sa_family == AF_INET6)
-	{
-		s[0] = '[';
-		strcat(s, "]");
-
-		if (sk->ip6.sin6_port != 0)
-			strcat(s, va(":%d", ntohs(sk->ip6.sin6_port)));
-	}
+	else if(sk->any.sa_family == AF_INET6 && sk->ip6.sin6_port != 0)
+		strcat(s, va(":%d", ntohs(sk->ip6.sin6_port)));
 #endif
 	else if(sk->any.sa_family == AF_INET  && sk->ip4.sin_port  != 0)
 		strcat(s, va(":%d", ntohs(sk->ip4.sin_port)));
@@ -500,30 +486,10 @@ static time_t SOCK_GetUnbanTime(size_t ban)
 }
 
 #ifndef NONET
-
-#ifdef HAVE_IPV6
-static boolean SOCK_cmpipv6(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
-{
-	UINT8 bitmask;
-	I_Assert(mask <= 128);
-	if (mask == 0)
-		mask = 128;
-	if (memcmp(&a->ip6.sin6_addr.s6_addr, &b->ip6.sin6_addr.s6_addr, mask / 8) != 0)
-		return false;
-	if (mask % 8 == 0)
-		return true;
-	bitmask = 255 << (mask % 8);
-	return (a->ip6.sin6_addr.s6_addr[mask / 8] & bitmask) == (b->ip6.sin6_addr.s6_addr[mask / 8] & bitmask);
-}
-#endif
-
 static boolean SOCK_cmpaddr(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
 {
 	UINT32 bitmask = INADDR_NONE;
 
-	if (a->any.sa_family != b->any.sa_family)
-		return false;
-
 	if (mask && mask < 32)
 		bitmask = htonl((UINT32)(-1) << (32 - mask));
 
@@ -532,14 +498,13 @@ static boolean SOCK_cmpaddr(mysockaddr_t *a, mysockaddr_t *b, UINT8 mask)
 			&& (b->ip4.sin_port == 0 || (a->ip4.sin_port == b->ip4.sin_port));
 #ifdef HAVE_IPV6
 	else if (b->any.sa_family == AF_INET6)
-		return SOCK_cmpipv6(a, b, mask)
+		return memcmp(&a->ip6.sin6_addr, &b->ip6.sin6_addr, sizeof(b->ip6.sin6_addr))
 			&& (b->ip6.sin6_port == 0 || (a->ip6.sin6_port == b->ip6.sin6_port));
 #endif
 	else
 		return false;
 }
 
-
 // This is a hack. For some reason, nodes aren't being freed properly.
 // This goes through and cleans up what nodes were supposed to be freed.
 /** \warning This function causes the file downloading to stop if someone joins.
@@ -655,7 +620,6 @@ is_external_address (UINT32 p)
 
 static boolean hole_punch(ssize_t c)
 {
-	holepunch_t *holepunchpacket = HOLEPUNCH_DATA(doomcom);
 
 	/* See ../doc/Holepunch-Protocol.txt */
 	if (cv_rendezvousserver.string[0] &&
@@ -695,7 +659,6 @@ static boolean SOCK_Get(void)
 		fromlen = (socklen_t)sizeof(fromaddress);
 		c = recvfrom(mysockets[n], (char *)&doomcom->data, MAXPACKETLENGTH, 0,
 			(void *)&fromaddress, &fromlen);
-
 		if (c > 0)
 		{
 #ifdef USE_STUN
@@ -905,11 +868,11 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 	unsigned long trueval = true;
 #endif
 	mysockaddr_t straddr;
-	socklen_t len = sizeof(straddr);
+	struct sockaddr_in sin;
+	socklen_t len = sizeof(sin);
 
 	if (s == (SOCKET_TYPE)ERRSOCKET)
 		return (SOCKET_TYPE)ERRSOCKET;
-
 #ifdef USE_WINSOCK
 	{ // Alam_GBC: disable the new UDP connection reset behavior for Win2k and up
 #ifdef USE_WINSOCK2
@@ -929,12 +892,14 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 	}
 #endif
 
-	memcpy(&straddr, addr, addrlen);
+	straddr.any = *addr;
 	I_OutputMsg("Binding to %s\n", SOCK_AddrToStr(&straddr));
 
 	if (family == AF_INET)
 	{
-		if (straddr.ip4.sin_addr.s_addr == htonl(INADDR_ANY))
+		mysockaddr_t tmpaddr;
+		tmpaddr.any = *addr ;
+		if (tmpaddr.ip4.sin_addr.s_addr == htonl(INADDR_ANY))
 		{
 			opt = true;
 			opts = (socklen_t)sizeof(opt);
@@ -959,7 +924,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 #ifdef HAVE_IPV6
 	else if (family == AF_INET6)
 	{
-		if (memcmp(&straddr.ip6.sin6_addr, &in6addr_any, sizeof(in6addr_any)) == 0) //IN6_ARE_ADDR_EQUAL
+		if (memcmp(addr, &in6addr_any, sizeof(in6addr_any)) == 0) //IN6_ARE_ADDR_EQUAL
 		{
 			opt = true;
 			opts = (socklen_t)sizeof(opt);
@@ -974,7 +939,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 		// make it IPv6 ony
 		opt = true;
 		opts = (socklen_t)sizeof(opt);
-		rc = setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, (char *)&opt, opts);
+		rc = setsockopt(s, SOL_SOCKET, IPV6_V6ONLY, (char *)&opt, opts);
 		if (rc <= -1)
 		{
 			e = errno;
@@ -1004,7 +969,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 
 			inet_pton(AF_INET6, IPV6_MULTICAST_ADDRESS, &maddr.ipv6mr_multiaddr);
 			maddr.ipv6mr_interface = 0;
-			rc = setsockopt(s, IPPROTO_IPV6, IPV6_JOIN_GROUP, (const char *)&maddr, sizeof(maddr));
+			rc = setsockopt(s, SOL_SOCKET, IPV6_JOIN_GROUP, (const char *)&maddr, sizeof(maddr));
 			if (rc <= -1)
 			{
 				e = errno;
@@ -1067,7 +1032,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 			CONS_Printf(M_GetText("Network system buffer set to: %dKb\n"), opt>>10);
 	}
 
-	rc = getsockname(s, &straddr.any, &len);
+	rc = getsockname(s, (struct sockaddr *)&sin, &len);
 	if (rc != 0)
 	{
 		e = errno;
@@ -1075,14 +1040,7 @@ static SOCKET_TYPE UDP_Bind(int family, struct sockaddr *addr, socklen_t addrlen
 		I_OutputMsg("getsockname failed: #%u, %s\n", e, strerror(e));
 	}
 	else
-	{
-		if (family == AF_INET)
-			current_port = (UINT16)ntohs(straddr.ip4.sin_port);
-#ifdef HAVE_IPV6
-		else if (family == AF_INET6)
-			current_port = (UINT16)ntohs(straddr.ip6.sin6_port);
-#endif
-	}
+		current_port = (UINT16)ntohs(sin.sin_port);
 
 	return s;
 }
@@ -1163,7 +1121,6 @@ static boolean UDP_Socket(void)
 			I_freeaddrinfo(ai);
 		}
 	}
-
 #ifdef HAVE_IPV6
 	if (b_ipv6)
 	{
@@ -1362,13 +1319,12 @@ static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const
 {
 	struct my_addrinfo *ai = NULL, *runp, hints;
 	int gaie;
-	size_t i;
 
 	if (!port || !port[0])
 		port = DEFAULTPORT;
 
 	memset (&hints, 0x00, sizeof (hints));
-	hints.ai_flags = AI_ADDRCONFIG;
+	hints.ai_flags = 0;
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_DGRAM;
 	hints.ai_protocol = IPPROTO_UDP;
@@ -1387,19 +1343,10 @@ static boolean SOCK_GetAddr(struct sockaddr_in *sin, const char *address, const
 	{
 		while (runp != NULL)
 		{
-			// test ip address of server
-			for (i = 0; i < mysocketses; ++i)
-			{
-				if (runp->ai_addr->sa_family == myfamily[i])
-				{
-					break;
-				}
-			}
-
-			if (i >= mysocketses)
-				runp = runp->ai_next;
-			else
+			if (sendto(mysockets[0], NULL, 0, 0, runp->ai_addr, runp->ai_addrlen) == 0)
 				break;
+
+			runp = runp->ai_next;
 		}
 	}
 
@@ -1443,8 +1390,6 @@ static void rendezvous(int size)
 
 	tic_t tic = I_GetTime();
 
-	holepunch_t *holepunchpacket = HOLEPUNCH_DATA(doomcom);
-
 	if (tic != refreshtic)
 	{
 		if (SOCK_GetAddr(&rzv.ip4, host, (port ? port : "7777"), false))
@@ -1470,7 +1415,6 @@ static void rendezvous(int size)
 static void SOCK_RequestHolePunch(INT32 node)
 {
 	mysockaddr_t * addr = &clientaddress[node];
-	holepunch_t *holepunchpacket = HOLEPUNCH_DATA(doomcom);
 
 	holepunchpacket->addr = addr->ip4.sin_addr.s_addr;
 	holepunchpacket->port = addr->ip4.sin_port;
@@ -1792,7 +1736,7 @@ boolean I_InitTcpNetwork(void)
 
 		// server address only in ip
 		if (serverhostname[0])
-		{
+		{			
 			CONS_Printf("SERVERNAME: %s\n", serverhostname);
 			COM_BufAddText("connect \"");
 			COM_BufAddText(serverhostname);

src/i_video.h

@@ -145,6 +145,8 @@ boolean I_UseNativeKeyboard(void);
 
 boolean I_CheckNativeRes(void);
 
+void I_SetBorderlessWindow(void);
+
 #ifdef USE_FBO_OGL
 
 void RefreshOGLSDLSurface(void);

src/k_kart.c

@@ -3084,7 +3084,7 @@ static void K_SpawnDriftSparks(player_t *player)
 	const boolean onground = P_IsObjectOnGround(player->mo);
 
 	// kinda sketchy
-	if (!cv_airsparks.value && onground)
+	if (!cv_airsparks.value && !onground)
 		return;
 
 	if (!player->kartstuff[k_drift] || player->kartstuff[k_driftcharge] < K_GetKartDriftSparkValue(player))

src/mserv.h

@@ -30,11 +30,7 @@ typedef union
 typedef struct
 {
 	msg_header_t header;
-#ifndef HAVE_IPV6
 	char ip[16];
-#else
-	char ip[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"];
-#endif
 	char port[8];
 	char contact[32];
 	char version[8]; // format is: x.yy.z (like 1.30.2 or 1.31)

src/p_setup.c

@@ -3071,7 +3071,7 @@ boolean P_SetupLevel(boolean fromnetsave, boolean reloadinggamestate)
 
 	if (!fromnetsave) // uglier hack
 	{ // to make a newly loaded level start on the second frame.
-		INT32 buf = gametic % BACKUPTICS;
+		INT32 buf = gametic % TICQUEUE;
 
 		for (i = 0; i < MAXPLAYERS; i++)
 		{

src/screen.c

@@ -66,7 +66,9 @@ static void Highreshudscale_OnChange(void)
 
 static void SCR_ChangeFullscreen (void);
 
-consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, CV_YesNo, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL};
+static CV_PossibleValue_t fullscreen_cons_t[] = {{0, "No"}, {1, "Yes"}, {2, "Borderless Window"}, {0, NULL}};
+
+consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, fullscreen_cons_t, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL};
 
 static CV_PossibleValue_t accuratefps_cons_t[] = {{0, "Inaccurate"}, {1, "Accurate"}, {0, NULL}};
 consvar_t cv_accuratefps = {"fpssampling", "1", CV_SAVE, accuratefps_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -325,6 +327,8 @@ void SCR_SetDefaultMode(void)
 void SCR_ChangeFullscreen(void)
 {
 #ifdef DIRECTFULLSCREEN
+	I_SetBorderlessWindow(); // Running this here so we can have borderless window at startup
+
 	// allow_fullscreen is set by VID_PrepareModeList
 	// it is used to prevent switching to fullscreen during startup
 	if (!allow_fullscreen)

src/sdl/i_video.c

@@ -150,7 +150,7 @@ UINT8 graphics_started = 0; // Is used in console.c and screen.c
 // To disable fullscreen at startup; is set in VID_PrepareModeList
 boolean allow_fullscreen = false;
 static SDL_bool disable_fullscreen = SDL_FALSE;
-#define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)?0:cv_fullscreen.value
+#define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)? 0: (cv_fullscreen.value == 1)
 static SDL_bool disable_mouse = SDL_FALSE;
 #define USE_MOUSEINPUT (!disable_mouse && cv_usemouse.value && havefocus)
 #define MOUSE_MENU false //(!disable_mouse && cv_usemouse.value && menuactive && !USE_FULLSCREEN)
@@ -1353,6 +1353,7 @@ static void SDLSetMode(INT32 width, INT32 height, SDL_bool fullscreen)
 		{
 			wasfullscreen = SDL_TRUE;
 			SDL_SetWindowFullscreen(window, SDL_WINDOW_FULLSCREEN_DESKTOP);
+			I_SetBorderlessWindow();
 		}
 		else // windowed mode
 		{
@@ -2157,4 +2158,10 @@ static void Impl_SetVsync(void)
 #endif
 }
 
+void I_SetBorderlessWindow(void)
+{
+	SDL_bool borderless = (cv_fullscreen.value == 2) ? SDL_FALSE : SDL_TRUE;
+	SDL_SetWindowBordered(window, borderless);
+}
+
 #endif