From: Samual Lenks <samual@xonotic.org>
Date: Wed, 19 Feb 2014 02:37:00 +0000 (-0500)
Subject: Preparation for other visual improvements to the beam
X-Git-Tag: xonotic-v0.8.0~152^2~79
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fa251728a97e180bccaf8b4aa73867c4da923ffc;p=xonotic%2Fxonotic-data.pk3dir.git

Preparation for other visual improvements to the beam
---

diff --git a/qcsrc/client/particles.qc b/qcsrc/client/particles.qc
index 9e4bfebb4..c3c16537d 100644
--- a/qcsrc/client/particles.qc
+++ b/qcsrc/client/particles.qc
@@ -368,6 +368,8 @@ void Net_ReadShockwaveParticle()
 .float beam_traileffect;
 .float beam_hiteffect;
 .float beam_muzzleflash;
+//.string beam_muzzlemodel;
+//.vector beam_muzzlecolor; // todo: should we just use beam_rgb?
 .string beam_image;
 
 .float beam_usevieworigin;
@@ -646,6 +648,9 @@ void Ent_ReadArcBeam(float isnew)
 				self.beam_traileffect = FALSE;
 				self.beam_hiteffect = particleeffectnum("electro_lightning");
 				self.beam_muzzleflash = FALSE; //particleeffectnum("nex_muzzleflash");
+				//self.beam_muzzlemodel = "models/uziflash.md3";
+				//self.beam_muzzlecolor = '-1 -1 1';
+				self.beam_image = "particles/lgbeam";
 				break;
 			}
 			case ARC_BT_WALL: // grenadelauncher_muzzleflash healray_muzzleflash
@@ -656,6 +661,9 @@ void Ent_ReadArcBeam(float isnew)
 				self.beam_traileffect = FALSE;
 				self.beam_hiteffect = particleeffectnum("electro_lightning"); 
 				self.beam_muzzleflash = FALSE; // particleeffectnum("grenadelauncher_muzzleflash");
+				//self.beam_muzzlemodel = "models/uziflash.md3";
+				//self.beam_muzzlecolor = '-1 -1 1';
+				self.beam_image = "particles/lgbeam";
 				break;
 			}
 			case ARC_BT_HEAL:
@@ -666,6 +674,9 @@ void Ent_ReadArcBeam(float isnew)
 				self.beam_traileffect = FALSE;
 				self.beam_hiteffect = particleeffectnum("healray_impact"); 
 				self.beam_muzzleflash = FALSE; //particleeffectnum("nex_muzzleflash");
+				//self.beam_muzzlemodel = "models/uziflash.md3";
+				//self.beam_muzzlecolor = '-1 -1 1';
+				self.beam_image = "particles/lgbeam";
 				break;
 			}
 			case ARC_BT_HIT:
@@ -676,6 +687,9 @@ void Ent_ReadArcBeam(float isnew)
 				self.beam_traileffect = FALSE;
 				self.beam_hiteffect = particleeffectnum("electro_lightning"); 
 				self.beam_muzzleflash = FALSE; //particleeffectnum("nex_muzzleflash");
+				//self.beam_muzzlemodel = "models/uziflash.md3";
+				//self.beam_muzzlecolor = '-1 -1 1';
+				self.beam_image = "particles/lgbeam";
 				break;
 			}
 			case ARC_BT_BURST_MISS:
@@ -686,6 +700,9 @@ void Ent_ReadArcBeam(float isnew)
 				self.beam_traileffect = FALSE;
 				self.beam_hiteffect = particleeffectnum("electro_lightning"); 
 				self.beam_muzzleflash = FALSE; //particleeffectnum("nex_muzzleflash");
+				//self.beam_muzzlemodel = "models/uziflash.md3";
+				//self.beam_muzzlecolor = '-1 -1 1';
+				self.beam_image = "particles/lgbeam";
 				break;
 			}
 			case ARC_BT_BURST_WALL:
@@ -696,6 +713,9 @@ void Ent_ReadArcBeam(float isnew)
 				self.beam_traileffect = FALSE;
 				self.beam_hiteffect = particleeffectnum("electro_lightning"); 
 				self.beam_muzzleflash = FALSE; //particleeffectnum("nex_muzzleflash");
+				//self.beam_muzzlemodel = "models/uziflash.md3";
+				//self.beam_muzzlecolor = '-1 -1 1';
+				self.beam_image = "particles/lgbeam";
 				break;
 			}
 			case ARC_BT_BURST_HEAL:
@@ -706,6 +726,9 @@ void Ent_ReadArcBeam(float isnew)
 				self.beam_traileffect = FALSE;
 				self.beam_hiteffect = particleeffectnum("electro_lightning"); 
 				self.beam_muzzleflash = FALSE; //particleeffectnum("nex_muzzleflash");
+				//self.beam_muzzlemodel = "models/uziflash.md3";
+				//self.beam_muzzlecolor = '-1 -1 1';
+				self.beam_image = "particles/lgbeam";
 				break;
 			}
 			case ARC_BT_BURST_HIT:
@@ -716,6 +739,9 @@ void Ent_ReadArcBeam(float isnew)
 				self.beam_traileffect = FALSE;
 				self.beam_hiteffect = particleeffectnum("electro_lightning"); 
 				self.beam_muzzleflash = FALSE; //particleeffectnum("nex_muzzleflash");
+				//self.beam_muzzlemodel = "models/uziflash.md3";
+				//self.beam_muzzlecolor = '-1 -1 1';
+				self.beam_image = "particles/lgbeam";
 				break;
 			}
 
@@ -728,11 +754,12 @@ void Ent_ReadArcBeam(float isnew)
 				self.beam_traileffect = FALSE;
 				self.beam_hiteffect = FALSE; 
 				self.beam_muzzleflash = FALSE; //particleeffectnum("nex_muzzleflash");
+				//self.beam_muzzlemodel = "models/uziflash.md3";
+				//self.beam_muzzlecolor = '-1 -1 1';
+				self.beam_image = "particles/lgbeam";
 				break;
 			}
 		}
-		// todo: move this into the switch case above:
-		self.beam_image = "particles/lgbeam";
 	}
 
 	InterpolateOrigin_Note();