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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-09 08:14:19 -0400 (Mon, 09 Mar 2009)
New Revision: 6086

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
   branches/nexuiz-2.0/misc/tools/demotc.pl
Log:
r6084 | div0 | 2009-03-08 21:06:36 +0100 (Sun, 08 Mar 2009) | 2 lines
demotc: support client->server packets
r6085 | div0 | 2009-03-09 11:25:01 +0100 (Mon, 09 Mar 2009) | 2 lines
fix typo in a cvar name


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-03-09 10:25:01 UTC (rev 6085)
+++ branches/nexuiz-2.0/.patchsets	2009-03-09 12:14:19 UTC (rev 6086)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6039,6044-6082
+revisions_applied = 1-6039,6044-6085

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-03-09 10:25:01 UTC (rev 6085)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2009-03-09 12:14:19 UTC (rev 6086)
@@ -490,7 +490,7 @@
 // common team values
 set g_tdm 0
 
-seta teamplay_defaul 4	"default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the following four cvars"
+seta teamplay_default 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the following four cvars"
 seta g_mirrordamage 0.3	"for teamplay 4: mirror damage factor"
 seta g_friendlyfire 0.1	"for teamplay 4: fiendly fire factor"
 seta g_teamdamage_threshold 50	"for teamplay 4: threshold over which to apply mirror damage"

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc	2009-03-09 10:25:01 UTC (rev 6085)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc	2009-03-09 12:14:19 UTC (rev 6086)
@@ -834,7 +834,7 @@
 		UpdateCSQCProjectile(self);
 	}
 	// apply damage
-	if (damage != 0)
+	if (damage != 0 || (self.damageforcescale && vlen(force)))
 	if (self.event_damage)
 		self.event_damage (inflictor, attacker, damage, deathtype, hitloc, force);
 	self = oldself;

Modified: branches/nexuiz-2.0/misc/tools/demotc.pl
===================================================================
--- branches/nexuiz-2.0/misc/tools/demotc.pl	2009-03-09 10:25:01 UTC (rev 6085)
+++ branches/nexuiz-2.0/misc/tools/demotc.pl	2009-03-09 12:14:19 UTC (rev 6086)
@@ -77,11 +77,26 @@
 my $demo_stopped = 0;
 my $inject_buffer = "";
 
+use constant DEMOMSG_CLIENT_TO_SERVER => 0x80000000;
 for(;;)
 {
 	last
 		unless 4 == read $infh, my $length, 4;
 	$length = unpack("V", $length);
+	if($length & DEMOMSG_CLIENT_TO_SERVER)
+	{
+		# client-to-server packet
+		$length = $length & ~DEMOMSG_CLIENT_TO_SERVER;
+		die "Invalid demo packet"
+			unless 12 == read $infh, my $angles, 12;
+		die "Invalid demo packet"
+			unless $length == read $infh, my($data), $length;
+
+		next if $mode eq 'grep';
+		print $outfh pack("V", length($data) | DEMOMSG_CLIENT_TO_SERVER);
+		print $outfh $angles;
+		print $outfh $data;
+	}
 	die "Invalid demo packet"
 		unless 12 == read $infh, my $angles, 12;
 	die "Invalid demo packet"