r5660 - in branches/nexuiz-2.0: . data/qcsrc/server misc/tools

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-01-24 15:53:49 -0500 (Sat, 24 Jan 2009)
New Revision: 5660

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/arena.qc
   branches/nexuiz-2.0/misc/tools/makebuild.sh
Log:
r5657 | div0 | 2009-01-24 20:48:11 +0100 (Sat, 24 Jan 2009) | 2 lines
makebuild: remove the showbrand block if desired
r5659 | div0 | 2009-01-24 21:10:58 +0100 (Sat, 24 Jan 2009) | 2 lines
fix reset_map logic

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-01-24 20:10:58 UTC (rev 5659)
+++ branches/nexuiz-2.0/.patchsets	2009-01-24 20:53:49 UTC (rev 5660)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5656
+revisions_applied = 1-5659

Modified: branches/nexuiz-2.0/data/qcsrc/server/arena.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/arena.qc	2009-01-24 20:10:58 UTC (rev 5659)
+++ branches/nexuiz-2.0/data/qcsrc/server/arena.qc	2009-01-24 20:53:49 UTC (rev 5660)
@@ -24,7 +24,7 @@
  * Resets the state of all clients, items, flags, runes, keys, weapons, waypoints, ... of the map.
  * Sets the 'warmup' global variable.
  */
-void reset_map(float norespawn)
+void reset_map(float dorespawn)
 {
 	entity oldself;
 	oldself = self;
@@ -70,7 +70,7 @@
 
 	// Moving the player reset code here since the player-reset depends
 	// on spawnpoint entities which have to be reset first --blub
-	if(!norespawn)
+	if(dorespawn)
 	FOR_EACH_CLIENT(self) {
 		if(self.flags & FL_CLIENT)				// reset all players
 		{

Modified: branches/nexuiz-2.0/misc/tools/makebuild.sh
===================================================================
--- branches/nexuiz-2.0/misc/tools/makebuild.sh	2009-01-24 20:10:58 UTC (rev 5659)
+++ branches/nexuiz-2.0/misc/tools/makebuild.sh	2009-01-24 20:53:49 UTC (rev 5660)
@@ -236,21 +236,15 @@
 rm FAQ.aft-TOC
 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 3\n$_"' default.cfg
-	cp "$buildfiles/brand/$versiontag.tga" gfx/brand.tga
+perl -pi -e '/^set g_nexuizversion "?([0-9.]*)[^"]*"?/ and $_ = "set g_nexuizversion '$version'\n"' defaultNexuiz.cfg
+if [ -z "$versiontag" ]; then
+	perl -pi -e 'm|^//!<showbrand| .. m|^//!>showbrand| and $_ = "";' defaultNexuiz.cfg
+	rm -f gfx/brand.tga
 fi
-echo >> default.cfg
-echo "$defaultcfg" >> default.cfg
+echo >> defaultNexuiz.cfg
+echo "$defaultcfg" >> defaultNexuiz.cfg
 mk7z ../data.pk3 .
 cd "$tmpdir/havoc"
-perl -pi -e '/^set g_nexuizversion "?([0-9.]*)[^"]*"?/ and $_ = "set g_nexuizversion '$version-havoc'\n"' default.cfg
-if [ -n "$versiontag" ]; then
-	perl -pi -e '/^set g_nexuizversion/ and $_ = "showbrand 3\n$_"' default.cfg
-fi
-echo >> default.cfg
-echo "$defaultcfg" >> default.cfg
 mk7z ../havoc.pk3 .
 
 # make data pk3