- Merge http://svn.icculus.org/tremulous?view=rev&revision=2185, patch by Chris Schwarz

- Remove Q_snprintf as Com_sprintf exists already

code/game/bg_lib.c

@@ -2083,18 +2083,6 @@ int Q_vsnprintf(char *str, size_t length, const char *fmt, va_list args)
 	return dopr(str, length, fmt, args);
 }
 
-int Q_snprintf(char *str, size_t length, const char *fmt, ...)
-{
-	va_list ap;
-	int retval;
-
-	va_start(ap, fmt);
-	retval = Q_vsnprintf(str, length, fmt, ap);
-	va_end(ap);
-	
-	return retval;
-}
-
 /* this is really crappy */
 int sscanf( const char *buffer, const char *fmt, ... ) {
 	int		cmd;

code/game/bg_lib.h

@@ -102,7 +102,6 @@ int _atoi( const char **stringPtr );
 long strtol( const char *nptr, char **endptr, int base );
 
 int Q_vsnprintf( char *buffer, size_t length, const char *fmt, va_list argptr );
-int Q_snprintf( char *buffer, size_t length, const char *fmt, ... ) __attribute__ ((format (printf, 3, 4)));
 
 int sscanf( const char *buffer, const char *fmt, ... ) __attribute__ ((format (scanf, 2, 3)));
 

code/game/g_main.c

@@ -1113,7 +1113,7 @@ void QDECL G_LogPrintf( const char *fmt, ... ) {
 	char		string[1024];
 	int			min, tens, sec;
 
-	sec = level.time / 1000;
+	sec = ( level.time - level.startTime ) / 1000;
 
 	min = sec / 60;
 	sec -= min * 60;