From 244e29d98a3bd774f0428e90f046004c4e367380 Mon Sep 17 00:00:00 2001 From: ThePWTULN Date: Sun, 15 Aug 2010 12:18:57 +0100 Subject: [PATCH] Transferring to correct repository --- qcsrc/common/campaign_common.qh | 1 + qcsrc/common/campaign_file.qc | 3 ++- qcsrc/server/campaign.qc | 5 +++-- qcsrc/server/g_world.qc | 19 +++++++++++++------ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/qcsrc/common/campaign_common.qh b/qcsrc/common/campaign_common.qh index a8e61fc4f..f6e240a6f 100644 --- a/qcsrc/common/campaign_common.qh +++ b/qcsrc/common/campaign_common.qh @@ -10,6 +10,7 @@ string campaign_mapname[CAMPAIGN_MAX_ENTRIES]; float campaign_bots[CAMPAIGN_MAX_ENTRIES]; float campaign_botskill[CAMPAIGN_MAX_ENTRIES]; float campaign_fraglimit[CAMPAIGN_MAX_ENTRIES]; +float campaign_timelimit[CAMPAIGN_MAX_ENTRIES]; string campaign_mutators[CAMPAIGN_MAX_ENTRIES]; string campaign_shortdesc[CAMPAIGN_MAX_ENTRIES]; string campaign_longdesc[CAMPAIGN_MAX_ENTRIES]; diff --git a/qcsrc/common/campaign_file.qc b/qcsrc/common/campaign_file.qc index 89b24ce51..08cec8092 100644 --- a/qcsrc/common/campaign_file.qc +++ b/qcsrc/common/campaign_file.qc @@ -54,12 +54,13 @@ float CampaignFile_Load(float offset, float n) CAMPAIGN_GETARG; campaign_bots[campaign_entries] = stof(a); CAMPAIGN_GETARG; campaign_botskill[campaign_entries] = stof(a); CAMPAIGN_GETARG; campaign_fraglimit[campaign_entries] = stof(a); + CAMPAIGN_GETARG; campaign_timelimit[campaign_entries] = stof(a); CAMPAIGN_GETARG; campaign_mutators[campaign_entries] = strzone(a); CAMPAIGN_GETARG; campaign_shortdesc[campaign_entries] = strzone(a); CAMPAIGN_GETARG; campaign_longdesc[campaign_entries] = strzone(strreplace("\\n", "\n", a)); campaign_entries = campaign_entries + 1; - if(campaign_entries >= n) + if(campaign_entries >= n) break; } lineno = lineno + 1; diff --git a/qcsrc/server/campaign.qc b/qcsrc/server/campaign.qc index 8a01a23b2..8d8e18587 100644 --- 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) @@ -249,3 +249,4 @@ void CampaignLevelWarp(float n) error("Sorry, cheater. You are NOT WELCOME."); CampaignFile_Unload(); } + diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 07898df16..55d61a73a 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -1509,16 +1509,23 @@ void InitiateOvertime() // ONLY call this if InitiateSuddenDeath returned true float GetWinningCode(float fraglimitreached, float equality) { - if(equality) - if(fraglimitreached) - return WINNING_STARTSUDDENDEATHOVERTIME; - else - return WINNING_NEVER; - else + if(cvar("g_campaign") == 1) if(fraglimitreached) return WINNING_YES; else return WINNING_NO; + + else + if(equality) + if(fraglimitreached) + return WINNING_STARTSUDDENDEATHOVERTIME; + else + return WINNING_NEVER; + else + if(fraglimitreached) + return WINNING_YES; + else + return WINNING_NO; } // set the .winning flag for exactly those players with a given field value -- 2.39.2