[nexuiz-commits] r7580 - in trunk/data/qcsrc: client server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-09-01 03:01:01 -0400 (Tue, 01 Sep 2009)
New Revision: 7580

Modified:
   trunk/data/qcsrc/client/modeleffects.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
modeleffects: also network skin


Modified: trunk/data/qcsrc/client/modeleffects.qc
===================================================================
--- trunk/data/qcsrc/client/modeleffects.qc	2009-09-01 06:56:52 UTC (rev 7579)
+++ trunk/data/qcsrc/client/modeleffects.qc	2009-09-01 07:01:01 UTC (rev 7580)
@@ -32,6 +32,7 @@
 	e.classname = "modeleffect";
 	e.model = "from network";
 	e.modelindex = ReadShort();
+	e.skin = ReadByte();
 	e.frame = ReadByte();
 	e.frame1time = time;
 	e.origin_x = ReadCoord();

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-09-01 06:56:52 UTC (rev 7579)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-09-01 07:01:01 UTC (rev 7580)
@@ -2484,6 +2484,7 @@
 	
 	WriteByte(MSG_ENTITY, f);
 	WriteShort(MSG_ENTITY, self.modelindex);
+	WriteByte(MSG_ENTITY, self.skin);
 	WriteByte(MSG_ENTITY, self.frame);
 	WriteCoord(MSG_ENTITY, self.origin_x);
 	WriteCoord(MSG_ENTITY, self.origin_y);
@@ -2515,7 +2516,7 @@
 	return TRUE;
 }
 
-void modeleffect_spawn(string m, float f, vector o, vector v, vector ang, vector angv, float s0, float s2, float a, float t1, float t2)
+void modeleffect_spawn(string m, float s, float f, vector o, vector v, vector ang, vector angv, float s0, float s2, float a, float t1, float t2)
 {
 	entity e;
 	float sz;
@@ -2530,6 +2531,7 @@
 	e.alpha = a;
 	e.teleport_time = t1;
 	e.fade_time = t2;
+	e.skin = s;
 	if(s0 >= 0)
 		e.scale = s0 / max6(-e.mins_x, -e.mins_y, -e.mins_z, e.maxs_x, e.maxs_y, e.maxs_z);
 	else
@@ -2545,5 +2547,5 @@
 
 void shockwave_spawn(string m, vector org, float sz, float t1, float t2)
 {
-	return modeleffect_spawn(m, 0, org, '0 0 0', '0 0 0', '0 0 0', 0, sz, 1, t1, t2);
+	return modeleffect_spawn(m, 0, 0, org, '0 0 0', '0 0 0', '0 0 0', 0, sz, 1, t1, t2);
 }