[nexuiz-commits] r7675 - in branches/nexuiz-2.0: . data data/qcsrc/server data/scripts misc/netradiant-NexuizPack/nexuiz.game/data

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun Sep 6 15:20:59 EDT 2009


Author: div0
Date: 2009-09-06 15:20:58 -0400 (Sun, 06 Sep 2009)
New Revision: 7675

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/Makefile
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc
   branches/nexuiz-2.0/data/scripts/entities.def
   branches/nexuiz-2.0/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
Log:
r7670 | fruitiex | 2009-09-06 14:56:36 -0400 (Sun, 06 Sep 2009) | 2 lines
sbar cvar fixes
r7672 | div0 | 2009-09-06 15:12:45 -0400 (Sun, 06 Sep 2009) | 2 lines
magic ear: decolorize before matching
r7673 | div0 | 2009-09-06 15:12:58 -0400 (Sun, 06 Sep 2009) | 2 lines
merge


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-09-06 19:15:12 UTC (rev 7674)
+++ branches/nexuiz-2.0/.patchsets	2009-09-06 19:20:58 UTC (rev 7675)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7601-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7644-7651,7658-7660,7663-7665
+revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7601-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7644-7651,7658-7660,7663-7665,7670-7670,7672-7673

Modified: branches/nexuiz-2.0/data/Makefile
===================================================================
--- branches/nexuiz-2.0/data/Makefile	2009-09-06 19:15:12 UTC (rev 7674)
+++ branches/nexuiz-2.0/data/Makefile	2009-09-06 19:20:58 UTC (rev 7675)
@@ -21,7 +21,7 @@
 .PHONY: update-cvarcount
 update-cvarcount:
 	[ "$(NEX_BUILDSYSTEM)" = "" ] || [ "$(NEX_BUILDSYSTEM)" = "1" ]
-	[ "$(NEX_BUILDSYSTEM)" != "" ] || { ! [ -f ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def ] || $(DIFF) ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def scripts/entities.def || { echo entities.def mismatch, please merge ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def and scripts/entities.def; exit 1; }; }
+	[ "$(NEX_BUILDSYSTEM)" != "" ] || { ! [ -f ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def ] || $(DIFF) scripts/entities.def ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def || { echo entities.def mismatch, please merge ../misc/netradiant-NexuizPack/nexuiz.game/data/entities.def and scripts/entities.def; exit 1; }; }
 	[ "$(NEX_BUILDSYSTEM)" != "" ] || { DO_NOT_RUN_MAKE=1 sh update-cvarcount.sh; }
 
 .PHONY: qc

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-09-06 19:15:12 UTC (rev 7674)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-09-06 19:20:58 UTC (rev 7675)
@@ -226,11 +226,7 @@
 vid_conwidth 800
 vid_conheight 600
 // menu_conwidth, menu_conheight are set inside quake.rc
-set sbar_hudselector 1	"0 = old style hud layout, 1 = new nexuiz hud layout, 2 = combined health and armor display"
-set sbar_hud_accuracy 0 "1 = weapon accuracy on HUD"
-set sbar_showcurrentammo 0 "set to 1 to see only the ammo of the current ammo or 0 to see all 4 ammo counts"
 v_deathtilt 0 // needed for spectators (who are dead to avoid prediction)
-sbar_info_pos 50
 
 // these settings determine how much the view is affected by movement/damage
 cl_bobcycle 0 // how long the cycle of up/down view movement takes (only works if cl_bob is not 0), default is 0.6
@@ -1301,15 +1297,19 @@
 con_notifyalign 0
 
 sbar_info_pos 50
-seta sbar_alpha_bg 0.8
-seta sbar_alpha_fg 1
-seta sbar_border_thickness 1 "scoreboard border tickness"
+seta sbar_alpha_bg 0.8 "alpha value of the HUD background"
+seta sbar_alpha_fg 1 "alpha value of the HUD foreground items"
+seta sbar_border_thickness 1 "scoreboard border thickness"
 seta sbar_color_bg_r 0 "red color component of the HUD background"
 seta sbar_color_bg_g 0.25 "green color component of the HUD background"
 seta sbar_color_bg_b 0.17 "blue color component of the HUD background"
 seta sbar_color_bg_team 0.5 "team color multiplier of the HUD background"
 seta sbar_scoreboard_alpha_bg 0.6 "scoreboard background alpha"
 seta sbar_scoreboard_highlight 1 "enable highlighting for rows and columns in the scoreboard"
+seta sbar_hudselector 1	"0 = health/armor positions flipped, 1 = default hud layout, 2 = combined health and armor display"
+seta sbar_hud_accuracy 0 "1 = weapon accuracy on HUD"
+seta sbar_showcurrentammo 0 "0 = show all ammo types, 1 = show only the ammo type of the current weapon"
+seta sbar_increment_maptime 0	"1 = show elapsed time on the timer"
 
 // for menu server list (eventually make them have engine support?)
 seta menu_slist_showfull 1 "show servers even if they are full and have no slots to join"
@@ -1571,8 +1571,6 @@
 seta sv_gentle 0	"force gentle mode for everyone, also remove references to acts of killing from the messages"
 seta cl_gentle 0	"client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs"
 
-seta sbar_increment_maptime 0	"set to 1 if you prefer an increasing hud timer"
-
 seta cl_showpressedkeys	0	"Show which movement keys someone is pressing: 1 for spectating, 2 for always"
 seta cl_showpressedkeys_position "0.5 0.8"	"1 0 would be upper right corner, 0.5 0.5 the center"
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc	2009-09-06 19:15:12 UTC (rev 7674)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc	2009-09-06 19:20:58 UTC (rev 7675)
@@ -1650,7 +1650,7 @@
 string trigger_magicear_processmessage(entity ear, entity source, float teamsay, entity privatesay, string msgin)
 {
 	float domatch, dotrigger, matchstart, l;
-	string s;
+	string s, msg;
 	entity oldself;
 
 	magicear_matched = FALSE;
@@ -1681,6 +1681,11 @@
 	matchstart = -1;
 	l = strlen(ear.message);
 
+	if(self.spawnflags & 128)
+		msg = msgin;
+	else
+		msg = strdecolorize(msgin);
+
 	if(substring(ear.message, 0, 1) == "*")
 	{
 		if(substring(ear.message, -1, 1) == "*")
@@ -1689,7 +1694,7 @@
 			// as we need multi-replacement here...
 			s = substring(ear.message, 1, -2);
 			l -= 2;
-			if(strstrofs(msgin, s, 0) >= 0)
+			if(strstrofs(msg, s, 0) >= 0)
 				matchstart = -2; // we use strreplace on s
 		}
 		else
@@ -1697,8 +1702,8 @@
 			// match at start
 			s = substring(ear.message, 1, -1);
 			l -= 1;
-			if(substring(msgin, -l, l) == s)
-				matchstart = strlen(msgin) - l;
+			if(substring(msg, -l, l) == s)
+				matchstart = strlen(msg) - l;
 		}
 	}
 	else
@@ -1708,14 +1713,14 @@
 			// match at end
 			s = substring(ear.message, 0, -2);
 			l -= 1;
-			if(substring(msgin, 0, l) == s)
+			if(substring(msg, 0, l) == s)
 				matchstart = 0;
 		}
 		else
 		{
 			// full match
 			s = ear.message;
-			if(msgin == ear.message)
+			if(msg == ear.message)
 				matchstart = 0;
 		}
 	}
@@ -1740,12 +1745,12 @@
 	else if(ear.netname != "")
 	{
 		if(matchstart < 0)
-			return strreplace(s, ear.netname, msgin);
+			return strreplace(s, ear.netname, msg);
 		else
 			return strcat(
-				substring(msgin, 0, matchstart),
+				substring(msg, 0, matchstart),
 				ear.netname,
-				substring(msgin, matchstart + l, -1)
+				substring(msg, matchstart + l, -1)
 			);
 	}
 	else

Modified: branches/nexuiz-2.0/data/scripts/entities.def
===================================================================
--- branches/nexuiz-2.0/data/scripts/entities.def	2009-09-06 19:15:12 UTC (rev 7674)
+++ branches/nexuiz-2.0/data/scripts/entities.def	2009-09-06 19:20:58 UTC (rev 7675)
@@ -1719,7 +1719,7 @@
 model="models/items/g_jetpack.md3"
 */
 
-/*QUAKED trigger_magicear (0 0 1) (-8 -8 -8) (8 8 8) IGNORE_SAY IGNORE_TEAMSAY IGNORE_TELL IGNORE_INVALIDTELL REPLACE_WHOLE_MESSAGE REPLACE_OUTSIDE CONTINUE
+/*QUAKED trigger_magicear (0 0 1) (-8 -8 -8) (8 8 8) IGNORE_SAY IGNORE_TEAMSAY IGNORE_TELL IGNORE_INVALIDTELL REPLACE_WHOLE_MESSAGE REPLACE_OUTSIDE CONTINUE NODECOLORIZE
 Triggers targets when a given magic word has been said
 -------- KEYS --------
 message: message to wait for (can start or end with * for wildcards)
@@ -1737,4 +1737,5 @@
 REPLACE_WHOLE_MESSAGE: replace the whole message by netname, or drop the message if netname is empty
 REPLACE_OUTSIDE: also perform the replacement when outside the radius (to hide the "secret word")
 CONTINUE: even if this magic ear matched, continue looking for further matches/replacements (useful for swear word filters)
+NODECOLORIZE: do not decolorize the input string before matching
 */

Modified: branches/nexuiz-2.0/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def
===================================================================
--- branches/nexuiz-2.0/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def	2009-09-06 19:15:12 UTC (rev 7674)
+++ branches/nexuiz-2.0/misc/netradiant-NexuizPack/nexuiz.game/data/entities.def	2009-09-06 19:20:58 UTC (rev 7675)
@@ -1719,7 +1719,7 @@
 model="models/items/g_jetpack.md3"
 */
 
-/*QUAKED trigger_magicear (0 0 1) (-8 -8 -8) (8 8 8) IGNORE_SAY IGNORE_TEAMSAY IGNORE_TELL IGNORE_INVALIDTELL REPLACE_WHOLE_MESSAGE REPLACE_OUTSIDE CONTINUE
+/*QUAKED trigger_magicear (0 0 1) (-8 -8 -8) (8 8 8) IGNORE_SAY IGNORE_TEAMSAY IGNORE_TELL IGNORE_INVALIDTELL REPLACE_WHOLE_MESSAGE REPLACE_OUTSIDE CONTINUE NODECOLORIZE
 Triggers targets when a given magic word has been said
 -------- KEYS --------
 message: message to wait for (can start or end with * for wildcards)
@@ -1737,4 +1737,5 @@
 REPLACE_WHOLE_MESSAGE: replace the whole message by netname, or drop the message if netname is empty
 REPLACE_OUTSIDE: also perform the replacement when outside the radius (to hide the "secret word")
 CONTINUE: even if this magic ear matched, continue looking for further matches/replacements (useful for swear word filters)
+NODECOLORIZE: do not decolorize the input string before matching
 */



More information about the nexuiz-commits mailing list