[iortcw] 03/10: Imported Upstream version 1.42b+20141229+dfsg1

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository iortcw.

commit 7a2b7995c27eaaffac5bac6c92b4c289ee11716a
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jan 3 22:43:38 2015 +0000

    Imported Upstream version 1.42b+20141229+dfsg1
---
 MP/code/game/g_main.c    | 2 ++
 MP/code/server/sv_main.c | 2 +-
 SP/code/game/g_main.c    | 1 +
 SP/code/server/sv_main.c | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/MP/code/game/g_main.c b/MP/code/game/g_main.c
index e034e13..f797c21 100644
--- a/MP/code/game/g_main.c
+++ b/MP/code/game/g_main.c
@@ -1238,6 +1238,8 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) {
 	}
 
 	G_RemapTeamShaders();
+
+	trap_SetConfigstring( CS_INTERMISSION, "" );
 }
 
 
diff --git a/MP/code/server/sv_main.c b/MP/code/server/sv_main.c
index 373ba46..0181944 100644
--- a/MP/code/server/sv_main.c
+++ b/MP/code/server/sv_main.c
@@ -583,7 +583,7 @@ qboolean SVC_RateLimit( leakyBucket_t *bucket, int burst, int period ) {
 		int expired = interval / period;
 		int expiredRemainder = interval % period;
 
-		if ( expired > bucket->burst ) {
+		if ( expired > bucket->burst || interval < 0 ) {
 			bucket->burst = 0;
 			bucket->lastTime = now;
 		} else {
diff --git a/SP/code/game/g_main.c b/SP/code/game/g_main.c
index 483d0e8..4e4c811 100644
--- a/SP/code/game/g_main.c
+++ b/SP/code/game/g_main.c
@@ -1326,6 +1326,7 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) {
 
 	G_RemapTeamShaders();
 
+	trap_SetConfigstring( CS_INTERMISSION, "" );
 }
 
 
diff --git a/SP/code/server/sv_main.c b/SP/code/server/sv_main.c
index 5cd3cea..9ff522d 100644
--- a/SP/code/server/sv_main.c
+++ b/SP/code/server/sv_main.c
@@ -501,7 +501,7 @@ qboolean SVC_RateLimit( leakyBucket_t *bucket, int burst, int period ) {
 		int expired = interval / period;
 		int expiredRemainder = interval % period;
 
-		if ( expired > bucket->burst ) {
+		if ( expired > bucket->burst || interval < 0 ) {
 			bucket->burst = 0;
 			bucket->lastTime = now;
 		} else {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git