r5340 - trunk/data/qcsrc/server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Mon Dec 29 04:20:21 EST 2008


Author: div0
Date: 2008-12-29 04:19:56 -0500 (Mon, 29 Dec 2008)
New Revision: 5340

Modified:
   trunk/data/qcsrc/server/g_triggers.qc
   trunk/data/qcsrc/server/miscfunctions.qc
   trunk/data/qcsrc/server/waypointsprites.qc
Log:
set a (somewhat) working modelindex for shared entities


Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc	2008-12-28 22:56:13 UTC (rev 5339)
+++ trunk/data/qcsrc/server/g_triggers.qc	2008-12-29 09:19:56 UTC (rev 5340)
@@ -600,11 +600,13 @@
 	self.SendFlags = 7;
 	if(!self.modelindex)
 	{
-		self.modelindex = 4.2;
-		self.origin += self.mins;
-		self.maxs = self.maxs - self.mins;
+		vector misave, masave;
+		misave = self.mins;
+		masave = self.maxs;
+		setmodel(self, "null");
+		setorigin(self, self.origin + misave);
+		setsize(self, '0 0 0', masave - misave);
 	}
-	self.model = "net_entity";
 	if(!self.cnt)
 		self.cnt = particleeffectnum(self.mdl);
 	IFTARGETED
@@ -698,8 +700,7 @@
 	self.effects = EF_NODEPTHTEST;
 	self.SendEntity = rainsnow_SendEntity;
 	self.Version = 1;
-	self.modelindex = 1;
-	self.model = "net_entity";
+	setmodel(self, "null");
 };
 
 
@@ -739,8 +740,7 @@
 	self.effects = EF_NODEPTHTEST;
 	self.SendEntity = rainsnow_SendEntity;
 	self.Version = 1;
-	self.modelindex = 1;
-	self.model = "net_entity";
+	setmodel(self, "null");
 };
 
 
@@ -957,8 +957,7 @@
 	self.effects = EF_NODEPTHTEST;
 	self.SendEntity = laser_SendEntity;
 	self.SendFlags = 15;
-	self.modelindex = 1;
-	self.model = "net_entity";
+	setmodel(self, "null");
 	self.mangle = self.angles;
 
 	IFTARGETED

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2008-12-28 22:56:13 UTC (rev 5339)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2008-12-29 09:19:56 UTC (rev 5340)
@@ -1148,6 +1148,7 @@
 void precache()
 {
 	// gamemode related things
+	precache_model ("null");
 	precache_model ("models/misc/chatbubble.spr");
 	precache_model ("models/misc/teambubble.spr");
 	if (g_runematch)
@@ -1544,8 +1545,7 @@
 
 void Net_LinkEntity(entity e)
 {
-	e.model = "net_entity";
-	e.modelindex = 1;
+	setmodel(e, "null");
 	e.effects = EF_NODEPTHTEST | EF_LOWPRECISION;
 }
 

Modified: trunk/data/qcsrc/server/waypointsprites.qc
===================================================================
--- trunk/data/qcsrc/server/waypointsprites.qc	2008-12-28 22:56:13 UTC (rev 5339)
+++ trunk/data/qcsrc/server/waypointsprites.qc	2008-12-29 09:19:56 UTC (rev 5340)
@@ -29,7 +29,7 @@
 {
 	if(o != e.origin)
 	{
-		e.origin = o;
+		setorigin(e, o);
 		e.SendFlags |= 128;
 	}
 }
@@ -242,10 +242,9 @@
 	wp.max_health = maxdistance;
 	wp.think = WaypointSprite_Think;
 	wp.nextthink = time;
-	wp.effects = EF_NODEPTHTEST | EF_LOWPRECISION;
+	//wp.effects = EF_NODEPTHTEST | EF_LOWPRECISION;
 	wp.model1 = spr;
-	wp.model = "net_entity";
-	wp.modelindex = 1;
+	setmodel(wp, "null");
 	wp.SendEntity = WaypointSprite_SendEntity;
 	wp.customizeentityforclient = WaypointSprite_Customize;
 	wp.waypointsprite_visible_for_player = WaypointSprite_visible_for_player;
@@ -287,7 +286,7 @@
 	vector ofs
 )
 {
-	return WaypointSprite_Spawn(spr, 0, 0, world, ofs, self, 0, self, waypointsprite_deployed_personal, FALSE);
+	return WaypointSprite_Spawn(spr, 0, 0, world, ofs, world, 0, self, waypointsprite_deployed_personal, FALSE);
 }
 
 .entity waypointsprite_attached;




More information about the nexuiz-commits mailing list