r4450 - in trunk/data/qcsrc: menu/nexuiz server

[DONOTREPLY at icculus.org]

Author: m0rfar
Date: 2008-09-11 12:49:36 -0400 (Thu, 11 Sep 2008)
New Revision: 4450

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
   trunk/data/qcsrc/server/teamplay.qc
Log:
Show all active mutators in motd.
Fixed some mutator typos.

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2008-09-11 12:53:14 UTC (rev 4449)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c	2008-09-11 16:49:36 UTC (rev 4450)
@@ -39,7 +39,7 @@
 	if(cvar("g_laserguided_missile"))
 		s = strcat(s, ", LG missiles");
 	if(cvar("g_midair"))
-		s = strcat(s, ", Mid-air");
+		s = strcat(s, ", Midair");
 	if(cvar("g_vampire"))
 		s = strcat(s, ", Vampire");
 	if(s == "")
@@ -55,13 +55,13 @@
 	me.TR(me);
 		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_cloaked", "Cloaked"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_footsteps", "Foot steps"));
+		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_footsteps", "Footsteps"));
 	me.TR(me);
 		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_grappling_hook", "Grappling hook"));
 	me.TR(me);
 		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_laserguided_missile", "Laser guided missiles"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_midair", "Mid-air"));
+		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_midair", "Midair"));
 	me.TR(me);
 		me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_vampire", "Vampire"));
 

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2008-09-11 12:53:14 UTC (rev 4449)
+++ trunk/data/qcsrc/server/teamplay.qc	2008-09-11 16:49:36 UTC (rev 4450)
@@ -388,13 +388,25 @@
 	else if(g_nixnex)
 		mutator = "^2No Items Nexuiz ^1";
 
-	if(g_midair) {
+	if(g_cloaked) {
 		// to protect against unheedingly made changes
 		if (modifications) {
 			modifications = strcat(modifications, ", ");
 		}
-		modifications = "midair";
+		modifications = "cloaked";
 	}
+	if(g_footsteps) {
+		if (modifications) {
+			modifications = strcat(modifications, ", ");
+		}
+		modifications = strcat(modifications, "footsteps");
+	}
+	if(g_midair) {
+		if (modifications) {
+			modifications = strcat(modifications, ", ");
+		}
+		modifications = strcat(modifications, "midair");
+	}
 	if(g_vampire) {
 		if (modifications) {
 			modifications = strcat(modifications, ", ");
@@ -405,8 +417,14 @@
 		if (modifications) {
 			modifications = strcat(modifications, ", ");
 		}
-		modifications = strcat(modifications, "laser-guided-missiles");
+		modifications = strcat(modifications, "laser guided missiles");
 	}
+	if(cvar("sv_gravity") < 800) {
+		if (modifications) {
+			modifications = strcat(modifications, ", ");
+		}
+		modifications = strcat(modifications, "low gravity");
+	}
 
 	local string versionmessage;
 	versionmessage = GetClientVersionMessage();
@@ -424,7 +442,7 @@
 		s = strcat(s, "\n\n", getTimeoutText(1));
 
 	if (g_grappling_hook)
-		s = strcat(s, "\n\n^8grappling hook is enabled, press 'e' to use it\n");
+		s = strcat(s, "\n\n^3grappling hook^8 is enabled, press 'e' to use it\n");
 
 	if(cache_lastmutatormsg != cvar_string("g_mutatormsg"))
 	{