X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_electro.qc;h=2be1573cd34e0c6b049acfffbb8eba464b4bc328;hb=b4a912024bf4786b87ee5ab789c53befcc48acb2;hp=3a54cf3861945c882b30ba5e3afcb77cb817e8d8;hpb=4cf67f3644408e5ac791692650b6b9b0660884cf;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 3a54cf386..2be1573cd 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -184,10 +184,39 @@ void W_Electro_Attack2()
 	CSQCProjectile(proj, TRUE, PROJECTILE_ELECTRO, FALSE); // no culling, it has sound
 }
 
+.vector hook_start, hook_end;
+float lgbeam_send(entity to, float sf)
+{
+	WriteByte(MSG_ENTITY, ENT_CLIENT_LGBEAM);
+	sf = sf & 0x7F;
+	if(sound_allowed(MSG_BROADCAST, self.owner))
+		sf |= 0x80;
+	WriteByte(MSG_ENTITY, sf);
+	if(sf & 1)
+	{
+		WriteByte(MSG_ENTITY, num_for_edict(self.owner));
+	}
+	if(sf & 2)
+	{
+		WriteCoord(MSG_ENTITY, self.hook_start_x);
+		WriteCoord(MSG_ENTITY, self.hook_start_y);
+		WriteCoord(MSG_ENTITY, self.hook_start_z);
+	}
+	if(sf & 4)
+	{
+		WriteCoord(MSG_ENTITY, self.hook_end_x);
+		WriteCoord(MSG_ENTITY, self.hook_end_y);
+		WriteCoord(MSG_ENTITY, self.hook_end_z);
+	}
+	return TRUE;
+}
 .entity lgbeam;
 .float prevlgfire;
 void lgbeam_think()
 {
+	vector endpos;
+	float oldsolid;
+
 	self.owner.prevlgfire = time;
 	if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self != self.owner.lgbeam || self.owner.deadflag != DEAD_NO || !self.owner.BUTTON_ATCK)
 	{
@@ -200,8 +229,24 @@ void lgbeam_think()
 	makevectors(self.owner.v_angle);
 	vector angle;
 	angle = v_forward;
+	// get effect origin
+	vector vecs, org;
+	if(self.owner.weaponentity.movedir_x > 0)
+		vecs = self.owner.weaponentity.movedir;
+	else
+		vecs = '0 0 0';
+	if(debug_shotorg != '0 0 0')
+		vecs = debug_shotorg;
+	org = self.owner.origin + self.owner.view_ofs + v_forward * vecs_x + v_right * -vecs_y + v_up * vecs_z;
 
-	WarpZone_traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_electro_primary_range"), FALSE, self.owner, ANTILAG_LATENCY(self.owner));
+	oldsolid = self.owner.dphitcontentsmask;
+	self.owner.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE;
+
+	WarpZone_traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_electro_primary_range"), MOVE_NORMAL, self.owner, ANTILAG_LATENCY(self.owner));
+	endpos = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
+	WarpZone_traceline_antilag(self.owner, org, endpos + 4 * normalize(endpos - org), MOVE_NORMAL, self.owner, ANTILAG_LATENCY(self.owner));
+
+	self.owner.dphitcontentsmask = oldsolid;
 
 	if not(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)
 		self.owner.ammo_cells = max(0, self.owner.ammo_cells - cvar("g_balance_electro_primary_ammo") * frametime);
@@ -216,27 +261,16 @@ void lgbeam_think()
 	}
 
 	// draw effect
-	vector vecs, org;
-	if(self.owner.weaponentity.movedir_x > 0)
+	if(org != self.hook_start)
 	{
-		vecs = self.owner.weaponentity.movedir;
-		vecs_y = -vecs_y;
+		self.SendFlags |= 2;
+		self.hook_start = org;
+	}
+	if(endpos != self.hook_end)
+	{
+		self.SendFlags |= 4;
+		self.hook_end = endpos;
 	}
-	else
-		vecs = '0 0 0';
-	org = self.owner.origin + self.owner.view_ofs + v_forward * vecs_x + v_right * vecs_y + v_up * vecs_z;
-	
-	// TODO turn into a csqc entity
-	WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);
-	WriteByte(MSG_BROADCAST, TE_CSQC_BEAM);
-	WriteByte(MSG_BROADCAST, num_for_edict(self.owner));
-	WriteByte(MSG_BROADCAST, sound_allowed(MSG_BROADCAST, self.owner) ? 1 : 2);
-	WriteCoord(MSG_BROADCAST, trace_endpos_x);
-	WriteCoord(MSG_BROADCAST, trace_endpos_y);
-	WriteCoord(MSG_BROADCAST, trace_endpos_z);
-	WriteCoord(MSG_BROADCAST, org_x);
-	WriteCoord(MSG_BROADCAST, org_y);
-	WriteCoord(MSG_BROADCAST, org_z);
 }
 
 // experimental lightning gun
@@ -258,6 +292,7 @@ void W_Electro_Attack3 (void)
 	beam.shot_spread = 0;
 	beam.bot_dodge = TRUE;
 	beam.bot_dodgerating = cvar("g_balance_electro_primary_damage");
+	Net_LinkEntity(beam, FALSE, 0, lgbeam_send);
 
 	oldself = self;
 	self = beam;