diff --git a/engine/common/net_chan.c b/engine/common/net_chan.c index 23ad8754..884180c4 100644 --- a/engine/common/net_chan.c +++ b/engine/common/net_chan.c @@ -1456,9 +1456,10 @@ void Netchan_TransmitBits( netchan_t *chan, int length, byte *data ) // stall reliable payloads if sending from frag buffer if( send_from_regular && ( send_from_frag[FRAG_NORMAL_STREAM] )) - { - send_from_regular = false; + { int maxsize = MAX_RELIABLE_PAYLOAD; + send_from_regular = false; + if( chan->pfnBlockSize ) maxsize = chan->pfnBlockSize( chan->client, FRAGSIZE_SPLIT ); diff --git a/engine/platform/win32/sys_win.c b/engine/platform/win32/sys_win.c index 714d7d6a..4c3628df 100644 --- a/engine/platform/win32/sys_win.c +++ b/engine/platform/win32/sys_win.c @@ -15,6 +15,9 @@ GNU General Public License for more details. #include #include "platform/platform.h" +#ifdef _WIN32 +BOOL WINAPI IsDebuggerPresent(VOID); +#endif // _WIN32 #if XASH_TIMER == TIMER_WIN32 double Platform_DoubleTime( void ) diff --git a/mainui b/mainui index 640b4ced..ebc9d90f 160000 --- a/mainui +++ b/mainui @@ -1 +1 @@ -Subproject commit 640b4ced65ed9303942d64b72257714e1f3db92c +Subproject commit ebc9d90fb16b713f484ddee9c6755fe6281c7fe0 diff --git a/scripts/waflib/msdev.py b/scripts/waflib/msdev.py index 3034bfee..df6b2ca9 100644 --- a/scripts/waflib/msdev.py +++ b/scripts/waflib/msdev.py @@ -664,7 +664,7 @@ MSDEV_PROJECT = \ '''