Merge remote branch 'origin/master' into tzork/balance-tzork

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / campaign.qc

diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc
index 8a01a23b2474d87319c3485bc61a018cce60753a..300d01a7a56607b031a28e5e0d419c2dbadd42ea 100644 (file)
--- a/qcsrc/server/campaign.qc
+++ b/qcsrc/server/campaign.qc
@@ -119,9 +119,9 @@ void CampaignPostInit()
        if(Campaign_Invalid())
                return;
        cvar_set("fraglimit", ftos(campaign_fraglimit[0]));
-       cvar_set("timelimit", "0");
+       cvar_set("timelimit", ftos(campaign_timelimit[0]));
        cvar_set_normal("fraglimit", ftos(campaign_fraglimit[0]));
-       cvar_set_normal("timelimit", "0");
+       cvar_set_normal("timelimit", ftos(campaign_timelimit[0]));
 }
 
 void CampaignSaveCvar(string cvarname, float value)
@@ -188,8 +188,23 @@ void CampaignPreIntermission()
 
        if(won == 1 && lost == 0 && checkrules_equality == 0 && cheatcount_total == 0)
        {
+               if(cvar("timelimit") != 0  &&  time > cvar("timelimit") * 60) // checks if the timelimit has expired.
+               {
+                       campaign_won = 0;
+                       bprint("Time's up! The current level has been LOST.\n");
+                       // sound!
+               }
+               else
+               {
                campaign_won = 1;
                bprint("The current level has been WON.\n");
+               // sound!       
+               }
+       }
+       else if(cvar("timelimit") != 0  &&  time > cvar("timelimit") * 60)
+       {
+               campaign_won = 0;
+               bprint("Time's up! The current level has been LOST.\n");
                // sound!
        }
        else
@@ -249,3 +264,4 @@ void CampaignLevelWarp(float n)
                error("Sorry, cheater. You are NOT WELCOME.");
        CampaignFile_Unload();
 }
+