From 3a5cf9f1ca524bd2995af78e941ea190b908f4bf Mon Sep 17 00:00:00 2001 From: kadaverjack Date: Sat, 21 Apr 2007 19:14:54 +0000 Subject: [PATCH] - 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 git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2373 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/arena.qc | 2 +- data/qcsrc/server/defs.qh | 2 +- data/qcsrc/server/teamplay.qc | 10 +++++----- misc/makebuild.sh | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/data/qcsrc/server/arena.qc b/data/qcsrc/server/arena.qc index a0607bbd2..4c0a7d963 100644 --- a/data/qcsrc/server/arena.qc +++ b/data/qcsrc/server/arena.qc @@ -122,7 +122,7 @@ void Arena_Warmup() f = rint(warmup - time); - msg = newlines; + msg = NEWLINES; if(time < warmup && self.spawned) { if(champion) diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh index c2c62d30c..a6ef81c52 100644 --- a/data/qcsrc/server/defs.qh +++ b/data/qcsrc/server/defs.qh @@ -16,7 +16,7 @@ float team1_score, team2_score, team3_score, team4_score; 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 diff --git a/data/qcsrc/server/teamplay.qc b/data/qcsrc/server/teamplay.qc index ab5005913..51b7dbc21 100644 --- a/data/qcsrc/server/teamplay.qc +++ b/data/qcsrc/server/teamplay.qc @@ -328,16 +328,16 @@ void PrintWelcomeMessage(entity pl) 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 @@ void PrintWelcomeMessage(entity pl) 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 != "") diff --git a/misc/makebuild.sh b/misc/makebuild.sh index 23d8f0633..134fe60bb 100755 --- a/misc/makebuild.sh +++ b/misc/makebuild.sh @@ -166,7 +166,7 @@ cd "$tmpdir/data" 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 -- 2.39.2