Merge remote-tracking branch 'origin/lugstuff' into lugstuff

This commit is contained in:
Alug committed 2025-05-06 17:08:41 +02:00
commit 63ca42d12c
2 files changed
+21 -37

No files matched your search

+21 -28
View File
@@ -49,34 +49,28 @@
#ifdef NONET
#undef HAVE_MINIUPNPC
#else
#ifdef USE_WINSOCK1
#include <winsock.h>
#elif !defined (SCOUW2) && !defined (SCOUW7) && !defined (__OS2__)
#ifndef USE_WINSOCK
#include <arpa/inet.h>
#endif //normal BSD API
#ifndef USE_WINSOCK
#ifdef __APPLE_CC__
#ifndef _BSD_SOCKLEN_T_
#define _BSD_SOCKLEN_T_
#endif //_BSD_SOCKLEN_T_
#endif //__APPLE_CC__
#include <sys/socket.h>
#include <netinet/in.h>
#endif //normal BSD API
#ifndef USE_WINSOCK
#include <netdb.h>
#include <sys/ioctl.h>
#endif //normal BSD API
#include <errno.h>
#include <time.h>
#ifdef USE_WINSOCK1
#include <winsock.h>
#else
#ifndef USE_WINSOCK
#include <arpa/inet.h>
#ifdef __APPLE_CC__
#ifndef _BSD_SOCKLEN_T_
#define _BSD_SOCKLEN_T_
#endif //_BSD_SOCKLEN_T_
#endif //__APPLE_CC__
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
#include <sys/ioctl.h>
#endif //normal BSD API
#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
#include <sys/time.h>
#endif // UNIXCOMMON
#include <errno.h>
#if defined (__unix__) || defined (__APPLE__) || defined (UNIXCOMMON)
#include <sys/time.h>
#endif // UNIXCOMMON
#endif // !NONET
#ifdef USE_WINSOCK
@@ -123,7 +117,7 @@
#ifndef STATUS_INVALID_PARAMETER
#define STATUS_INVALID_PARAMETER 0xC000000D
#endif
#endif
#endif // USE_WINSOCK
typedef union
{
@@ -168,7 +162,6 @@ static UINT8 UPNP_support = TRUE;
#endif
#include "i_addrinfo.h"
#define DEFAULTPORT "5029"
#if defined (USE_WINSOCK) && !defined (NONET)
-9
View File
@@ -1202,11 +1202,6 @@ void I_GetEvent(void)
{
case SDL_WINDOWEVENT:
Impl_HandleWindowEvent(evt.window);
#ifdef _WIN32
// Hack: on windows, when moving game window, sdl gets stuck handling those events, which may cause timeouts in netgames
if (evt.window == SDL_WINDOWEVENT_MOVED || evt.window == SDL_WINDOWEVENT_RESIZED || evt.window == SDL_WINDOWEVENT_SIZE_CHANGED)
goto exitpoolevent;
#endif
break;
case SDL_KEYUP:
case SDL_KEYDOWN:
@@ -1394,10 +1389,6 @@ void I_GetEvent(void)
}
}
#ifdef _WIN32
exitpoolevent:
#endif
// Send all relative mouse movement as one single mouse event.
if (mousemovex || mousemovey)
{