r2373 - branches/nexuiz-2.0/data/qcsrc/client branches/nexuiz-2.0/data/qcsrc/common branches/nexuiz-2.0/data/qcsrc/menu branches/nexuiz-2.0/data/qcsrc/server trunk/data/qcsrc/client trunk/data/qcsrc/common trunk/data/qcsrc/menu trunk/data/qcsrc/server trunk/misc

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Apr 21 15:14:54 EDT 2007


Author: kadaverjack
Date: 2007-04-21 15:14:54 -0400 (Sat, 21 Apr 2007)
New Revision: 2373

Modified:
   branches/nexuiz-2.0/data/qcsrc/client/
   branches/nexuiz-2.0/data/qcsrc/common/
   branches/nexuiz-2.0/data/qcsrc/menu/
   branches/nexuiz-2.0/data/qcsrc/server/
   branches/nexuiz-2.0/data/qcsrc/server/arena.qc
   branches/nexuiz-2.0/data/qcsrc/server/defs.qh
   branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
   trunk/data/qcsrc/client/
   trunk/data/qcsrc/common/
   trunk/data/qcsrc/menu/
   trunk/data/qcsrc/server/
   trunk/data/qcsrc/server/arena.qc
   trunk/data/qcsrc/server/defs.qh
   trunk/data/qcsrc/server/teamplay.qc
   trunk/misc/makebuild.sh
Log:
- changed newlines string to #define and added even more \n's to adjust for higher 2D resolution (spectator centerprints were over the crosshair before)
- changed showbrand to 7 in makebuild.sh, so the test-logo is in the upper left corner and not above the chatarea
- added ignores for fteqcc.log files



Property changes on: branches/nexuiz-2.0/data/qcsrc/client
___________________________________________________________________
Name: svn:ignore
   + fteqcc.log



Property changes on: branches/nexuiz-2.0/data/qcsrc/common
___________________________________________________________________
Name: svn:ignore
   + fteqcc.log



Property changes on: branches/nexuiz-2.0/data/qcsrc/menu
___________________________________________________________________
Name: svn:ignore
   + fteqcc.log



Property changes on: branches/nexuiz-2.0/data/qcsrc/server
___________________________________________________________________
Name: svn:ignore
   + fteqcc.log


Modified: branches/nexuiz-2.0/data/qcsrc/server/arena.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/arena.qc	2007-04-21 00:31:13 UTC (rev 2372)
+++ branches/nexuiz-2.0/data/qcsrc/server/arena.qc	2007-04-21 19:14:54 UTC (rev 2373)
@@ -122,7 +122,7 @@
 
 	f = rint(warmup - time);
 
-	msg = newlines;
+	msg = NEWLINES;
 	if(time < warmup && self.spawned)
 	{
 		if(champion)

Modified: branches/nexuiz-2.0/data/qcsrc/server/defs.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/defs.qh	2007-04-21 00:31:13 UTC (rev 2372)
+++ branches/nexuiz-2.0/data/qcsrc/server/defs.qh	2007-04-21 19:14:54 UTC (rev 2373)
@@ -16,7 +16,7 @@
 
 float maxclients;
 
-string newlines = "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n";
+#define NEWLINES "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
 
 // Fields
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc	2007-04-21 00:31:13 UTC (rev 2372)
+++ branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc	2007-04-21 19:14:54 UTC (rev 2373)
@@ -328,16 +328,16 @@
 	if(self.classname == "observer")
 	{
 		if(cvar("g_lms") && self.frags <= 0 && self.frags > -666)
-			return centerprint(self, strcat(newlines, "^1You have no more lives left\nwait for next round\n\n\n^7press attack to spectate other players"));
+			return centerprint(self, strcat(NEWLINES, "^1You have no more lives left\nwait for next round\n\n\n^7press attack to spectate other players"));
 		else if(cvar("g_lms") && self.frags == -666)
-			return centerprint(self, strcat(newlines, "^1Match has already begun\nwait for next round\n\n\n^7press attack to spectate other players"));
+			return centerprint(self, strcat(NEWLINES, "^1Match has already begun\nwait for next round\n\n\n^7press attack to spectate other players"));
 	}
 	else if(self.classname == "spectator")
 	{
 		if ((cvar("g_lms") && self.frags < 1) || cvar("g_arena"))
-			return centerprint(self, strcat(newlines, "spectating ", self.enemy.netname, "\n\n\n^7press attack for next player\npress attack2 for free fly mode"));
+			return centerprint(self, strcat(NEWLINES, "spectating ", self.enemy.netname, "\n\n\n^7press attack for next player\npress attack2 for free fly mode"));
 		else
-			return centerprint(self, strcat(newlines, "spectating ", self.enemy.netname, "\n\n\n^7press jump to play\n^7press attack for next player\npress attack2 for free fly mode"));
+			return centerprint(self, strcat(NEWLINES, "spectating ", self.enemy.netname, "\n\n\n^7press jump to play\n^7press attack for next player\npress attack2 for free fly mode"));
 	}
 
 
@@ -373,7 +373,7 @@
 	local string versionmessage;
 	versionmessage = GetClientVersionMessage(self.version);
 
-	s = strcat(s, newlines, "This is Nexuiz ", cvar_string("g_nexuizversion"), "\n", versionmessage);
+	s = strcat(s, NEWLINES, "This is Nexuiz ", cvar_string("g_nexuizversion"), "\n", versionmessage);
 	s = strcat(s, "^8\n\nmatch type is ^1", mutator, gamemode_name, "^8\n");
 
 	if(modifications != "")


Property changes on: trunk/data/qcsrc/client
___________________________________________________________________
Name: svn:ignore
   + fteqcc.log



Property changes on: trunk/data/qcsrc/common
___________________________________________________________________
Name: svn:ignore
   + fteqcc.log



Property changes on: trunk/data/qcsrc/menu
___________________________________________________________________
Name: svn:ignore
   + fteqcc.log



Property changes on: trunk/data/qcsrc/server
___________________________________________________________________
Name: svn:ignore
   + fteqcc.log


Modified: trunk/data/qcsrc/server/arena.qc
===================================================================
--- trunk/data/qcsrc/server/arena.qc	2007-04-21 00:31:13 UTC (rev 2372)
+++ trunk/data/qcsrc/server/arena.qc	2007-04-21 19:14:54 UTC (rev 2373)
@@ -122,7 +122,7 @@
 
 	f = rint(warmup - time);
 
-	msg = newlines;
+	msg = NEWLINES;
 	if(time < warmup && self.spawned)
 	{
 		if(champion)

Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh	2007-04-21 00:31:13 UTC (rev 2372)
+++ trunk/data/qcsrc/server/defs.qh	2007-04-21 19:14:54 UTC (rev 2373)
@@ -16,7 +16,7 @@
 
 float maxclients;
 
-string newlines = "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n";
+#define NEWLINES "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
 
 // Fields
 

Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc	2007-04-21 00:31:13 UTC (rev 2372)
+++ trunk/data/qcsrc/server/teamplay.qc	2007-04-21 19:14:54 UTC (rev 2373)
@@ -328,16 +328,16 @@
 	if(self.classname == "observer")
 	{
 		if(cvar("g_lms") && self.frags <= 0 && self.frags > -666)
-			return centerprint(self, strcat(newlines, "^1You have no more lives left\nwait for next round\n\n\n^7press attack to spectate other players"));
+			return centerprint(self, strcat(NEWLINES, "^1You have no more lives left\nwait for next round\n\n\n^7press attack to spectate other players"));
 		else if(cvar("g_lms") && self.frags == -666)
-			return centerprint(self, strcat(newlines, "^1Match has already begun\nwait for next round\n\n\n^7press attack to spectate other players"));
+			return centerprint(self, strcat(NEWLINES, "^1Match has already begun\nwait for next round\n\n\n^7press attack to spectate other players"));
 	}
 	else if(self.classname == "spectator")
 	{
 		if ((cvar("g_lms") && self.frags < 1) || cvar("g_arena"))
-			return centerprint(self, strcat(newlines, "spectating ", self.enemy.netname, "\n\n\n^7press attack for next player\npress attack2 for free fly mode"));
+			return centerprint(self, strcat(NEWLINES, "spectating ", self.enemy.netname, "\n\n\n^7press attack for next player\npress attack2 for free fly mode"));
 		else
-			return centerprint(self, strcat(newlines, "spectating ", self.enemy.netname, "\n\n\n^7press jump to play\n^7press attack for next player\npress attack2 for free fly mode"));
+			return centerprint(self, strcat(NEWLINES, "spectating ", self.enemy.netname, "\n\n\n^7press jump to play\n^7press attack for next player\npress attack2 for free fly mode"));
 	}
 
 
@@ -373,7 +373,7 @@
 	local string versionmessage;
 	versionmessage = GetClientVersionMessage(self.version);
 
-	s = strcat(s, newlines, "This is Nexuiz ", cvar_string("g_nexuizversion"), "\n", versionmessage);
+	s = strcat(s, NEWLINES, "This is Nexuiz ", cvar_string("g_nexuizversion"), "\n", versionmessage);
 	s = strcat(s, "^8\n\nmatch type is ^1", mutator, gamemode_name, "^8\n");
 
 	if(modifications != "")

Modified: trunk/misc/makebuild.sh
===================================================================
--- trunk/misc/makebuild.sh	2007-04-21 00:31:13 UTC (rev 2372)
+++ trunk/misc/makebuild.sh	2007-04-21 19:14:54 UTC (rev 2373)
@@ -166,7 +166,7 @@
 mv common-spog.pk3 ..
 perl -pi -e '/^set g_nexuizversion "([0-9.]*)[^"]*"/ and $_ = "set g_nexuizversion \"'$version'\"\n"' default.cfg
 if [ -n "$versiontag" ]; then
-	perl -pi -e '/^set g_nexuizversion/ and $_ = "showbrand 1\n$_"' default.cfg
+	perl -pi -e '/^set g_nexuizversion/ and $_ = "showbrand 7\n$_"' default.cfg
 	cp "$buildfiles/brand/$versiontag.tga" gfx/brand.tga
 fi
 echo >> default.cfg




More information about the nexuiz-commits mailing list