From 4b3ef408803eac0c765d7280ba1bf21bc95d2310 Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Mon, 29 Jan 2018 20:32:00 -0800
Subject: [PATCH] Fixed mp_timelimit! Thanks to wastelandpanda for reporting
 this.

---
 Source/Server/Timer.c |  32 +++++++++++++++++---------------
 freecs/progs.dat      | Bin 191758 -> 191774 bytes
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Source/Server/Timer.c b/Source/Server/Timer.c
index de3bfa12..6b5e3b11 100755
--- a/Source/Server/Timer.c
+++ b/Source/Server/Timer.c
@@ -52,23 +52,25 @@ void Timer_Update( void ) {
 	static float fVoxTimer;
 	
 	// This map has been played enough we think
-	if ( cvar( "mp_timelimit" ) > 0 ) {
-		if ( autocvar_sv_voxannounce == TRUE ) {
-			if ( fVoxTimer > time ) {
-				return;
-			}
-			
-			float fTimeLeft = ( cvar( "mp_timelimit" ) * 60 ) - time;
-			for ( int i = 0; i <= 10; i++ ) {
-				if ( rint( fTimeLeft ) == ( i * 60 ) ) {
-					Vox_Broadcast( sprintf( "%s minutes remaining", Vox_TimeToString( fTimeLeft / 60 ) ) );
-					fVoxTimer = time + 10.0f;
+	if ( fGameState != GAME_OVER ) {
+		if ( cvar( "mp_timelimit" ) > 0 ) {
+			if ( autocvar_sv_voxannounce == TRUE ) {
+				if ( fVoxTimer > time ) {
+					return;
+				}
+				
+				float fTimeLeft = ( cvar( "mp_timelimit" ) * 60 ) - time;
+				for ( int i = 0; i <= 10; i++ ) {
+					if ( rint( fTimeLeft ) == ( i * 60 ) ) {
+						Vox_Broadcast( sprintf( "%s minutes remaining", Vox_TimeToString( fTimeLeft / 60 ) ) );
+						fVoxTimer = time + 10.0f;
+					}
 				}
 			}
-		}
-	
-		if ( time >= ( cvar( "mp_timelimit" ) * 60 ) ) {
-			Timer_Begin( 5, GAME_OVER );
+		
+			if ( time >= ( cvar( "mp_timelimit" ) * 60 ) ) {
+				Timer_Begin( 5, GAME_OVER );
+			}
 		}
 	}
 	
diff --git a/freecs/progs.dat b/freecs/progs.dat
index 57193b15571496da5d320d6c6ed1e6a8491c78c0..44aaf455f614d4ce72ed0a7f39e8ffa8621ec578 100755
GIT binary patch
delta 1318
zcmWmEUr5z=7{~GN?>Ah!gG|dqc;PnZ`nNPXFt==T<Wi3|Pt&EXV+bDQu)1&%?2KHf
zlO@eTF>CflhA|;8WEcoZv~nQLZC0m}WlSM92?s`JWaQW%VtYOpUtZ7m!*lcSeEFW3
z51g3~gjPA{Hmr3neb%{nfpgm$eYZd0T-Lbn%01_{KJ?rp-?=ZW@9=HA_l4H@>8b9@
z@k;MeEbCd9^d7tS1M_yCw-!G6!^^o))8gIw)eDmMmS5l%P$oje#cTA6Dn>;sGh&$)
z@fW!}jm?ybN@5~Pk7#8?93UyWSQh;R%Z(vQ#Ce*;6}rWBhQ$ig;y+R%NOpyhPqA1}
zRJ=@w*us!_ohh-4C9#*xN+V849H2oQp<Q$`D2_2HF0m+*WQ2_y6p5dy6L(06jSLw4
z7WT8a9`<v*A{LatN?MiWHC2{xtFpX=hy`AlL!yy>v7d{gg}dS~UbS(Ab>alo;v{Y2
zG=1U><KjGX;wPSnf63ov1gH?1927e_F3K4bP0WfIe~UPIZyO29#8KknOM1l!qvA(q
z#2hQ)KDjl<YD&d=Vxo{9v7HgIo1|!AS$sq=Vth`CI8Bo{OSd@3u(-;!cuYz}$lh(V
zQY_ktiY_|DR}6`7nG)Z#B<_&;j*&q~yg-8p(=M7B6dg>8VHU*?WYikBDH6X^CmxUx
zg$#&VCd57#M1r(BV~kB=nuz#?L*hRD;vpBs8{8GA@ZL4PW}TRzT3n+|+@w$3VqDx~
zPIU4_93y{^ahVEnje}x_<KiA;;sLXU@8$8&9{)vl)Z4QvtoL*HOjWH_ww!pqb*`aT
z<S;5WFe5%@MSMzbgK?Bn@eMH%p+|hci0C3Io?}_OLU6CKgA&n9ljx*dj4>=OF)h9$
zC9aVDp7AHe;w7S@g${9&A#s%{v6UrJOy)jgJ0Vd@gLsp6af3mzib?Sdiz1thsIi(N
mgAb!Nesk2uUrR#yW(GtV6QY&{5xtPs=s$Jp>GYKSdhUO*pLbmV

delta 1300
zcmWmEe@N7K9LMp`_d8raM0U+&2)WJ5)<tf(Cg?UdY@X>%%Q~~Gt=%OCviw7uBboPy
zfiPhXZ|R;0tI;AhAqj({Zp%N6xw7dthi(|iI4G#7w%i=~hivcHUk^Ud|K9N8bNXiH
zr#CZ;RygNgc*ePvv(7bbaBlMf-yO`fnDkwR=iKvud2YdXuFul(8G9#+vi-;RyDF2F
z-a?GNhu+#t?;Q4i`NPYmaJ#?3%cowvM7t<vP*gH1Vx+~NWV~hkOHc%<6&19JMg~NT
zlsLk?h~rflCn*qLQY|jhD#l2N8zjZw%!y@|MK<{%<2gcNBQ0Vxy<#gPqLf)t#gYh<
zS7|g+E{@PFI_MFd42y22MT$l7Be^?_Ny@}DF)>58*u;<sGG#Ei!w-C3<*)T#A*af6
zF{K72Repe@>LI$+_j67}m=IAOh!0s)ZFEp9J|QCdh>L#Ch%Xoy7r85bAnR>oi6XIz
z29ZgJDCd;e&X_pJZSfwfYK$fd#WCu|3EIVH42rKA72~AE?_}&W?hq6KYQ;v{#1;lb
z2`RCYc@f2{H9nv~d`z|Ir&WAKLYyZlt}`bVSQa(p*BLQF;(b~~oL(`=h`7wGxXO~4
zA#azlf^zXJ%_2mPIK;5{h-q<_Me#kkyNzEd6Ss(odvuE}42e3X#6BL0W8~Bu7bq3i
zcvt*Jm$<_@@sJ7eDi1`0HG7QH6pQbOhza6iiZkLT#zmUDqLZw>MmI&`TN=a!9pYzB
zi8N#49=8quzjdq*`|G_d3d1(5tzny0G;Fg9(5|ps;Twgg8MWXQkQT?uXfV16iWAg|
zA=*R@1L7zt5ocbk!`o-POo4cVYH^5G(MdvFASqJJi7PCNG4dOYe+Y^7w1_CZqK^@A
zomufBOJW;&`;8LH#cMQ+*Xa?H42uk=#Yz^%Q{+aB0A(VZm_amRclSr^?jS?zZ!#t7
VcqAGx<s9&zIQit``}W7V{{iHubT$A0