From: terencehill <piuntn@gmail.com>
Date: Sun, 31 Mar 2013 21:20:41 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/ca_arena_mutators
X-Git-Tag: xonotic-v0.7.0~61^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6c111e4d7176d56d83f0f1fc10280493c0439b9e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/ca_arena_mutators

Conflicts:
	qcsrc/server/arena.qc
	qcsrc/server/cl_client.qc
	qcsrc/server/progs.src
---

6c111e4d7176d56d83f0f1fc10280493c0439b9e
diff --cc qcsrc/server/cl_client.qc
index ae5d8406d,4c7d5c575..54b3efff8
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -401,25 -401,6 +401,24 @@@ void PutObserverInServer (void
  		WriteEntity(MSG_ONE, self);
  	}
  
 +	if(g_lms)
 +	{
 +		// Only if the player cannot play at all
 +		if(PlayerScore_Add(self, SP_LMS_RANK, 0) == 666)
 +			self.frags = FRAGS_SPECTATOR;
 +		else
 +			self.frags = FRAGS_LMS_LOSER;
 +	}
 +	else if((g_race && g_race_qualifying) || g_cts)
 +	{
 +		if(PlayerScore_Add(self, SP_RACE_FASTEST, 0))
 +			self.frags = FRAGS_LMS_LOSER;
 +		else
 +			self.frags = FRAGS_SPECTATOR;
 +	}
 +	else
 +		self.frags = FRAGS_SPECTATOR;
 +
- 	DropAllRunes(self);
  	MUTATOR_CALLHOOK(MakePlayerObserver);
  
  	minstagib_stop_countdown(self);
diff --cc qcsrc/server/progs.src
index 03326da84,f33be85b9..bb23eb68e
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -105,7 -101,8 +105,7 @@@ g_subs.q
  
  g_tetris.qc
  
- runematch.qc
+ //runematch.qc
 -arena.qc
  
  g_violence.qc
  g_damage.qc