From: Mario <mario.mario@y7mail.com>
Date: Sun, 10 Feb 2013 01:34:01 +0000 (+1100)
Subject: Merge branch 'master' into mario/monsters
X-Git-Tag: xonotic-v0.8.0~241^2^2~525
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f56909500a5fc5b0719870d23b82cc3f2904f3c1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mario/monsters
---

f56909500a5fc5b0719870d23b82cc3f2904f3c1
diff --cc qcsrc/server/g_world.qc
index 31a72537f,680afbc89..0fac81d85
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -954,13 -939,9 +954,11 @@@ void spawnfunc_worldspawn (void
  	// weird mutators that deserve to count as mod
  	if(autocvar_g_minstagib)
  		modname = "MinstaGib";
 +	if(autocvar_g_monsters)
 +		modname = "Monsters";
  	// extra mutators that deserve to count as mod
  	MUTATOR_CALLHOOK(SetModname);
- 	// weird game types that deserve to count as mod
- 	if(g_cts)
- 		modname = "CTS";
+ 
  	// save it for later
  	modname = strzone(modname);