minor fix to update checking, refs #32

etlegacy · Dec 18, 2014 · 4b6bf1d · 4b6bf1d
1 parent 68e0196
commit 4b6bf1d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/client/cl_main.c b/src/client/cl_main.c
@@ -762,13 +762,15 @@ void CL_RequestMotd(void)
 
 void CL_RequestMasterData(qboolean force)
 {
-	if (!force && autoupdate.masterDataChecked > 0 && cls.realtime - autoupdate.masterDataChecked < 300000)
+	int tempTime = cls.realtime - autoupdate.masterDataChecked;
+
+	//Only check when we are not running a game
+	if (cls.state >= CA_LOADING)
 	{
 		return;
 	}
 
-	//Only check when we are not running a game
-	if (cls.state >= CA_LOADING)
+	if (!force && autoupdate.masterDataChecked && tempTime < 300000 && tempTime > 0)
 	{
 		return;
 	}

diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h
@@ -402,6 +402,10 @@ typedef int clipHandle_t;
 #define BIT(x)              (1 << x)
 #endif
 
+#define ENABLEBIT(x, y) x |= BIT(y)
+#define CLEARBIT(x, y) x &= ~BIT(y)
+#define TOGGLEBIT(x, y) x ^= BIT(y)
+
 //#define   SND_NORMAL          0x000   // (default) Allow sound to be cut off only by the same sound on this channel
 #define     SND_OKTOCUT         0x001   // Allow sound to be cut off by any following sounds on this channel
 #define     SND_REQUESTCUT      0x002   // Allow sound to be cut off by following sounds on this channel only for sounds who request cutoff