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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-04-19 10:54:49 -0400 (Sun, 19 Apr 2009)
New Revision: 6534

Modified:
   trunk/data/qcsrc/client/projectile.qc
   trunk/data/qcsrc/common/constants.qh
   trunk/data/qcsrc/server/w_crylink.qc
Log:
properly transmit whether crylink projectiles are bouncing or not


Modified: trunk/data/qcsrc/client/projectile.qc
===================================================================
--- trunk/data/qcsrc/client/projectile.qc	2009-04-19 14:51:13 UTC (rev 6533)
+++ trunk/data/qcsrc/client/projectile.qc	2009-04-19 14:54:49 UTC (rev 6534)
@@ -256,6 +256,7 @@
 			case PROJECTILE_BULLET: setmodel(self, "models/tracer.mdl"); break;
 			case PROJECTILE_BULLET_GLOWING: setmodel(self, "models/tracer.mdl"); break;
 			case PROJECTILE_CRYLINK: setmodel(self, "models/plasmatrail.mdl"); break;
+			case PROJECTILE_CRYLINK_BOUNCING: setmodel(self, "models/plasmatrail.mdl"); break;
 			case PROJECTILE_ELECTRO_BEAM: setmodel(self, "models/elaser.mdl"); break;
 			case PROJECTILE_GRENADE: setmodel(self, "models/grenademodel.md3"); break;
 			case PROJECTILE_GRENADE_BOUNCING: setmodel(self, "models/grenademodel.md3"); break;
@@ -325,6 +326,10 @@
 				self.move_movetype = MOVETYPE_BOUNCE;
 				self.move_touch = SUB_Null;
 				break;
+			case PROJECTILE_CRYLINK_BOUNCING:
+				self.move_movetype = MOVETYPE_BOUNCE;
+				self.move_touch = SUB_Null;
+				break;
 			default:
 				break;
 		}

Modified: trunk/data/qcsrc/common/constants.qh
===================================================================
--- trunk/data/qcsrc/common/constants.qh	2009-04-19 14:51:13 UTC (rev 6533)
+++ trunk/data/qcsrc/common/constants.qh	2009-04-19 14:54:49 UTC (rev 6534)
@@ -375,6 +375,7 @@
 float PROJECTILE_HAGAR = 16;
 float PROJECTILE_HAGAR_BOUNCING = 17;
 float PROJECTILE_BULLET_GLOWING = 18;
+float PROJECTILE_CRYLINK_BOUNCING = 19;
 
 // Deathtypes (weapon deathtypes are the IT_* constants below)
 // NOTE: when adding death types, please add an explanation to Docs/spamlog.txt too.

Modified: trunk/data/qcsrc/server/w_crylink.qc
===================================================================
--- trunk/data/qcsrc/server/w_crylink.qc	2009-04-19 14:51:13 UTC (rev 6533)
+++ trunk/data/qcsrc/server/w_crylink.qc	2009-04-19 14:54:49 UTC (rev 6534)
@@ -24,8 +24,9 @@
 	self.angles = vectoangles(self.velocity);
 	self.owner = world;
 	self.projectiledeathtype |= HITTYPE_BOUNCE;
-	//self.scale = 1 + self.cnt;
-	UpdateCSQCProjectile(self);
+	// commented out as it causes a little hitch...
+	//if(proj.cnt == 0)
+	//	CSQCProjectile(proj, TRUE, PROJECTILE_CRYLINK, TRUE);
 }
 
 void W_Crylink_Touch2 (void)
@@ -50,7 +51,9 @@
 	self.angles = vectoangles(self.velocity);
 	self.owner = world;
 	self.projectiledeathtype |= HITTYPE_BOUNCE;
-//	self.scale = 1 + 1 * self.cnt;
+	// commented out as it causes a little hitch...
+	//if(proj.cnt == 0)
+	//	CSQCProjectile(proj, TRUE, PROJECTILE_CRYLINK, TRUE);
 }
 
 void W_Crylink_Attack (void)
@@ -115,7 +118,7 @@
 
 		proj.flags = FL_PROJECTILE;
 
-		CSQCProjectile(proj, TRUE, PROJECTILE_CRYLINK, TRUE);
+		CSQCProjectile(proj, TRUE, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), TRUE);
 
 		counter = counter + 1;
 	}
@@ -164,7 +167,7 @@
 
 		proj.flags = FL_PROJECTILE;
 
-		CSQCProjectile(proj, TRUE, PROJECTILE_CRYLINK, TRUE);
+		CSQCProjectile(proj, TRUE, (proj.cnt ? PROJECTILE_CRYLINK_BOUNCING : PROJECTILE_CRYLINK), TRUE);
 
 		counter = counter + 1;
 	}