From: Mario <mario.mario@y7mail.com>
Date: Tue, 9 Apr 2013 05:39:35 +0000 (+1000)
Subject: Merge branch 'master' into Mario/lms_updates
X-Git-Tag: xonotic-v0.7.0~60^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=332b1bfac54491c16e6ef8a806fcc1d5dd768ef6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/lms_updates
---

332b1bfac54491c16e6ef8a806fcc1d5dd768ef6
diff --cc qcsrc/server/g_damage.qc
index faf21c5bc,29eed9af8..cfd5fdc82
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@@ -197,10 -186,24 +186,6 @@@ void GiveFrags (entity attacker, entit
  	else
  	{
  		self = oldself;
- 		if(g_runematch)
 -		if(g_lms)
--		{
- 			f = RunematchHandleFrags(attacker, targ, f);
 -			// remove a life
 -			float tl;
 -			tl = PlayerScore_Add(targ, SP_LMS_LIVES, -1);
 -			if(tl < lms_lowest_lives)
 -				lms_lowest_lives = tl;
 -			if(tl <= 0)
 -			{
 -				if(!lms_next_place)
 -					lms_next_place = player_count;
 -				else
 -					lms_next_place = min(lms_next_place, player_count);
 -				PlayerScore_Add(targ, SP_LMS_RANK, lms_next_place); // won't ever spawn again
 -				--lms_next_place;
 -			}
 -			f = 0;
--		}
  	}
  
  	attacker.totalfrags += f;