From 141e42ef6232720f09ae0fc026f9ebebe83ac600 Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 29 Sep 2008 06:51:11 +0000 Subject: [PATCH] fix early/late cap scoring git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4549 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/ctf.qc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/server/ctf.qc b/data/qcsrc/server/ctf.qc index 38b15e15f..a581e7544 100644 --- a/data/qcsrc/server/ctf.qc +++ b/data/qcsrc/server/ctf.qc @@ -372,10 +372,12 @@ void FlagTouch() bprint(other.netname, "^7 picked up the ", self.netname, "\n"); float f; - f = (time - self.pain_finished) / cvar("g_ctf_flag_returntime"); + f = bound(0, (self.pain_finished - time) / cvar("g_ctf_flag_returntime"), 1); + //print("factor is ", ftos(f), "\n"); f = cvar("g_ctf_flagscore_pickup_dropped_late") * (1-f) + cvar("g_ctf_flagscore_pickup_dropped_early") * f; f = floor(f + 0.5); + //print("score is ", ftos(f), "\n"); UpdateFrags(other, f); PlayerScore_Add(other, SP_CTF_PICKUPS, 1); -- 2.39.2