From e4718d6ad6794fd5e7fbba999916026263902b3a Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 26 Nov 2008 10:20:42 +0000 Subject: [PATCH] more assault fixes (timelimit) git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5107 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/common/mapinfo.qc | 11 +++++++++-- data/qcsrc/server/assault.qc | 7 +------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/data/qcsrc/common/mapinfo.qc b/data/qcsrc/common/mapinfo.qc index 573d6f7b1..197686e94 100644 --- a/data/qcsrc/common/mapinfo.qc +++ b/data/qcsrc/common/mapinfo.qc @@ -467,8 +467,15 @@ void _MapInfo_Map_ApplyGametype(string s, float pWantedType, float pThisType) if(!(pThisType & pWantedType)) return; - cvar_set("fraglimit", car(s)); - s = cdr(s); + if(pWantedType == MAPINFO_TYPE_ASSAULT || pWantedType == MAPINFO_TYPE_ONSLAUGHT) // these modes don't use fraglimit + { + cvar_set("fraglimit", "0"); + } + else + { + cvar_set("fraglimit", car(s)); + s = cdr(s); + } cvar_set("timelimit", car(s)); s = cdr(s); diff --git a/data/qcsrc/server/assault.qc b/data/qcsrc/server/assault.qc index fefb339d1..d8c09c13e 100644 --- a/data/qcsrc/server/assault.qc +++ b/data/qcsrc/server/assault.qc @@ -201,6 +201,7 @@ void spawnfunc_func_assault_wall() { void target_assault_roundend_reset() { + print("round end reset\n"); self.cnt = self.cnt + 1; // up round counter self.winning = 0; // up round } @@ -210,10 +211,6 @@ void target_assault_roundend_use() { } void spawnfunc_target_assault_roundend() { - if(!self.health) - self.health = 300; // 5 minutes - - cvar_set("timelimit", ftos(self.health/60)); self.winning = 0; // round not yet won by attackers self.classname = "target_assault_roundend"; self.use = target_assault_roundend_use; @@ -267,8 +264,6 @@ void assault_new_round() { // up round counter self.winning = self.winning + 1; - // set end time for next round - self.cnt = time + self.health; // swap attacker/defender roles if(assault_attacker_team == COLOR_TEAM1) { -- 2.39.2