r2524 - in trunk: data/qcsrc/server misc

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-05-08 11:24:20 -0400 (Tue, 08 May 2007)
New Revision: 2524

Modified:
   trunk/data/qcsrc/server/g_damage.qc
   trunk/data/qcsrc/server/keyhunt.qh
   trunk/misc/makebuild.sh
Log:
log carried keys as K in sv_eventlog frag output; update makebuild


Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc	2007-05-07 22:14:09 UTC (rev 2523)
+++ trunk/data/qcsrc/server/g_damage.qc	2007-05-08 15:24:20 UTC (rev 2524)
@@ -70,6 +70,8 @@
 		s = strcat(s, "F");
 	if(player.buttonchat)
 		s = strcat(s, "T");
+	if(player.kh_next)
+		s = strcat(s, "K");
 	if(player.runes)
 		s = strcat(s, "|", ftos(player.runes));
 	return s;

Modified: trunk/data/qcsrc/server/keyhunt.qh
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qh	2007-05-07 22:14:09 UTC (rev 2523)
+++ trunk/data/qcsrc/server/keyhunt.qh	2007-05-08 15:24:20 UTC (rev 2524)
@@ -1,5 +1,6 @@
 float kh_teams;
 float kh_tracking_enabled;
+.entity kh_next, kh_prev;
 
 void kh_Scores_Event(entity player, entity key, string what, float frags_player, float frags_owner);
 void kh_Key_Attach(entity key);

Modified: trunk/misc/makebuild.sh
===================================================================
--- trunk/misc/makebuild.sh	2007-05-07 22:14:09 UTC (rev 2523)
+++ trunk/misc/makebuild.sh	2007-05-08 15:24:20 UTC (rev 2524)
@@ -19,10 +19,11 @@
 
 version=2-svntest-$date
 versiontag=test
-defaultcfg="cl_nettimesyncmode 6"
+defaultcfg=""
 
 basepk3=$base/data20060905.pk3
 nexdir=$base/nexuiz
+nexprodir=$base/nexuizpro
 dpdir=$base/darkplaces
 tmpdir=/tmp/NEX
 zipdir=/home/polzer/UT/distfiles/nex/
@@ -129,6 +130,9 @@
 cd "$nexdir/data"
 svn export . "$tmpdir/data"
 
+cd "$nexprodir"
+svn export . "$tmpdir/pro"
+
 cd "$nexdir/Docs"
 svn export . "$tmpdir/Docs"
 
@@ -173,11 +177,23 @@
 echo "$defaultcfg" >> default.cfg
 7za a -mx=7 -tzip ../data.pk3 .
 
+cd "$tmpdir/pro"
+perl -pi -e '/^set g_nexuizversion "([0-9.]*)[^"]*"/ and $_ = "set g_nexuizversion \"'$version-pro'\"\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
+7za a -mx=7 -tzip ../pro.pk3 .
+
 cd "$tmpdir"
 rm -rf data
 mkdir data
 mv data.pk3 data/data$date.pk3
 mv common-spog.pk3 data/
+rm -rf pro
+mkdir pro
+mv pro.pk3 pro/data${date}pro.pk3
 
 cp -r "$mingwdlls"/* .
 # fix up permissions
@@ -189,7 +205,7 @@
 find . -name .svn -exec rm -rf {} \; -prune
 
 rm -f "$zipdir/nexuiz$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuiz$date$ext.zip"           Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/data$date.pk3 Nexuiz/data/common-spog.pk3
+zip $zipflags -9yr "$zipdir/nexuiz$date$ext.zip"           Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/data$date.pk3 Nexuiz/data/common-spog.pk3 Nexuiz/pro/*
 rm -f "$zipdir/nexuizengineonly$date$ext.zip"
 zip $zipflags -9yr "$zipdir/nexuizengineonly$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll
 rm -f "$zipdir/nexuizsource$date$ext.zip"
@@ -203,7 +219,7 @@
 fi
 
 rm -f "$zipdir/nexuizpatch$date$ext.zip"
-zip $zipflags -9yr "$zipdir/nexuizpatch$date$ext.zip"      Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/datapatch$date.pk3
+zip $zipflags -9yr "$zipdir/nexuizpatch$date$ext.zip"      Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/datapatch$date.pk3 Nexuiz/pro/*
 
 rm -f "$zipdir/nexuizdocs$date$ext.zip"
 zip $zipflags -9yr "$zipdir/nexuizdocs$date$ext.zip"       Nexuiz/gpl.txt Nexuiz/Docs