From f89c9464ceaa485874ddc9dabcea0732cfb4bf4e Mon Sep 17 00:00:00 2001 From: Spoike Date: Sat, 25 Dec 2004 02:06:27 +0000 Subject: [PATCH] Works with gamespy now. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@689 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/cl_main.c | 5 ++--- engine/client/sys_win.c | 12 +++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c index 0f820718a..6f6368de8 100644 --- a/engine/client/cl_main.c +++ b/engine/client/cl_main.c @@ -1528,7 +1528,6 @@ void CL_ConnectionlessPacket (void) { char *s; int c; - MSG_BeginReading (); MSG_ReadLong (); // skip the -1 @@ -1727,7 +1726,7 @@ client_connect: //fixme: make function return; } // remote command from gui front end - if (c == A2C_CLIENT_COMMAND) + if (c == A2C_CLIENT_COMMAND) //man I hate this. { char cmdtext[2048]; @@ -1768,7 +1767,7 @@ client_connect: //fixme: make function return; } - Cbuf_AddText (cmdtext, RESTRICT_LOCAL); + Cbuf_AddText (cmdtext, RESTRICT_SERVER); allowremotecmd = false; return; } diff --git a/engine/client/sys_win.c b/engine/client/sys_win.c index f846d5deb..465e8b257 100644 --- a/engine/client/sys_win.c +++ b/engine/client/sys_win.c @@ -488,10 +488,12 @@ void Sys_Init (void) // LARGE_INTEGER PerformanceFreq; // unsigned int lowpart, highpart; OSVERSIONINFO vinfo; -/* + #ifndef SERVERONLY #ifndef CLIENTONLY - if (!isDedicated) + if (!isDedicated && !COM_CheckParm("-nomutex")) +#else + if (!COM_CheckParm("-nomutex")) //we need to create a mutex to allow gamespy to realise that we're running, but it might not be desired as it prevents other clients from running too. #endif { // allocate a named semaphore on the client so the @@ -513,7 +515,7 @@ void Sys_Init (void) "qwcl"); // Semaphore name } #endif - */ + MaskExceptions (); Sys_SetFPCW (); @@ -985,8 +987,8 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin static char cwd[1024]; int t; RECT rect; - - /* previous instances do not exist in Win32 */ + + /* previous instances do not exist in Win32 */ if (hPrevInstance) return 0;