[nexuiz-commits] r6621 - in branches/nexuiz-2.0: . data/qcsrc/menu/item data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-04-29 16:50:23 -0400 (Wed, 29 Apr 2009)
New Revision: 6621

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/menu/item/inputbox.c
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
Log:
r6619 | div0 | 2009-04-29 21:10:55 +0200 (Wed, 29 Apr 2009) | 2 lines
yet another fteqcc bug workaround
r6620 | div0 | 2009-04-29 21:14:44 +0200 (Wed, 29 Apr 2009) | 2 lines
minstagib: make players always fullbright again


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-04-29 19:14:44 UTC (rev 6620)
+++ branches/nexuiz-2.0/.patchsets	2009-04-29 20:50:23 UTC (rev 6621)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6536,6541-6549,6552-6567,6572-6577,6580-6582,6585-6587,6592-6593,6598-6598,6603-6616
+revisions_applied = 1-6536,6541-6549,6552-6567,6572-6577,6580-6582,6585-6587,6592-6593,6598-6598,6603-6620

Modified: branches/nexuiz-2.0/data/qcsrc/menu/item/inputbox.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/item/inputbox.c	2009-04-29 19:14:44 UTC (rev 6620)
+++ branches/nexuiz-2.0/data/qcsrc/menu/item/inputbox.c	2009-04-29 20:50:23 UTC (rev 6621)
@@ -76,12 +76,15 @@
 void enterTextInputBox(entity me, string ch)
 {
 	float i;
+	string s1, s2;
 	for(i = 0; i < strlen(ch); ++i)
 		if(strstrofs(me.forbiddenCharacters, substring(ch, i, 1), 0) > -1)
 			return;
 	if(strlen(ch) + strlen(me.text) > me.maxLength)
 		return;
-	me.setText(me, strcat(substring(me.text, 0, me.cursorPos), ch, substring(me.text, me.cursorPos, strlen(me.text) - me.cursorPos)));
+	s1 = substring(me.text, 0, me.cursorPos);
+	s2 = substring(me.text, me.cursorPos, strlen(me.text) - me.cursorPos);
+	me.setText(me, strcat(s1, ch, s2)); // fteqcc sucks
 	me.cursorPos += strlen(ch);
 }
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-04-29 19:14:44 UTC (rev 6620)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2009-04-29 20:50:23 UTC (rev 6621)
@@ -1609,6 +1609,8 @@
 
 	if (g_minstagib)
 	{
+		self.effects |= EF_FULLBRIGHT;
+
 		if (self.items & IT_STRENGTH)
 		{
 			play_countdown(self.strength_finished, "misc/poweroff.wav");