From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 6 Mar 2012 09:41:20 +0000 (+0100)
Subject: network mutator name properly
X-Git-Tag: xonotic-v0.7.0~348^2~1^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=72898707a85495295ef9a6d33a83af10eafc8e49;p=xonotic%2Fxonotic-data.pk3dir.git

network mutator name properly
---

diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c
index fbf64c98b..f1d45ab5b 100644
--- a/qcsrc/menu/xonotic/serverlist.c
+++ b/qcsrc/menu/xonotic/serverlist.c
@@ -649,6 +649,7 @@ void XonoticServerList_drawListBoxItem(entity me, float i, vector absSize, float
 	if(modname != "Xonotic")
 	if(modname != "MinstaGib")
 	if(modname != "CTS")
+	if(modname != "NIX")
 	if(modname != "NewToys")
 		pure = 0;
 
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index d787d480d..f2e845367 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -368,7 +368,6 @@ void cvar_changes_init()
 		BADCVAR("g_maplist_votable_nodetail");
 		BADCVAR("g_maplist_votable_suggestions");
 		BADCVAR("g_maxplayers");
-		BADCVAR("g_minstagib");
 		BADCVAR("g_mirrordamage");
 		BADCVAR("g_nexball_goallimit");
 		BADCVAR("g_powerups");
@@ -415,6 +414,11 @@ void cvar_changes_init()
 		BADPREFIX("g_warmup_");
 		BADPREFIX("sv_ready_restart_");
 
+		// mutators that announce themselves properly to the server browser
+		BADCVAR("g_minstagib");
+		BADCVAR("g_new_toys");
+		BADCVAR("g_nix");
+
 		if(autocvar_g_minstagib)
 		{
 			BADCVAR("g_grappling_hook");
diff --git a/qcsrc/server/mutators/mutator_nix.qc b/qcsrc/server/mutators/mutator_nix.qc
index 68a50a519..dad19e4a3 100644
--- a/qcsrc/server/mutators/mutator_nix.qc
+++ b/qcsrc/server/mutators/mutator_nix.qc
@@ -218,6 +218,12 @@ MUTATOR_HOOKFUNCTION(nix_PlayerSpawn)
 	return 0;
 }
 
+MUTATOR_HOOKFUNCTION(nix_SetModname)
+{
+	modname = "NIX";
+	return 0;
+}
+
 MUTATOR_DEFINITION(mutator_nix)
 {
 	entity e;
@@ -229,6 +235,7 @@ MUTATOR_DEFINITION(mutator_nix)
 	MUTATOR_HOOK(OnEntityPreSpawn, nix_OnEntityPreSpawn, CBC_ORDER_ANY);
 	MUTATOR_HOOK(PlayerPreThink, nix_PlayerPreThink, CBC_ORDER_ANY);
 	MUTATOR_HOOK(PlayerSpawn, nix_PlayerSpawn, CBC_ORDER_ANY);
+	MUTATOR_HOOK(SetModname, nix_SetModname, CBC_ORDER_LAST);
 
 	MUTATOR_ONADD
 	{