From d5cfff13fe3588faa9f719ec90dbe3fbf55cdd34 Mon Sep 17 00:00:00 2001
From: vermeulenl <vermeulenl@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Mon, 4 Apr 2005 00:40:50 +0000
Subject: [PATCH] Moved Nex shot back Moved chat graphic up

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@350 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 qcsrc/gamec/cl_client.c |  2 +-
 qcsrc/gamec/w_common.c  | 13 -------------
 qcsrc/gamec/w_nex.c     | 21 +++++++++++++++++++--
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/qcsrc/gamec/cl_client.c b/qcsrc/gamec/cl_client.c
index 72c0b7b0f..16f6fa904 100644
--- a/qcsrc/gamec/cl_client.c
+++ b/qcsrc/gamec/cl_client.c
@@ -238,7 +238,7 @@ void() ChatBubbleThink =
 		remove(self);
 		return;
 	}
-	setorigin(self, self.owner.origin + '0 0 10' + self.owner.maxs_z * '0 0 1');
+	setorigin(self, self.owner.origin + '0 0 15' + self.owner.maxs_z * '0 0 1');
 	if (self.owner.buttonchat)
 		self.effects = 0;
 	else
diff --git a/qcsrc/gamec/w_common.c b/qcsrc/gamec/w_common.c
index fe3cbc15a..3f2b9a717 100644
--- a/qcsrc/gamec/w_common.c
+++ b/qcsrc/gamec/w_common.c
@@ -414,19 +414,6 @@ void FireRailgunBullet (vector start, vector end, float bdamage, float deathtype
 	// go a little bit into the wall because we need to hit this wall later
 	end = trace_endpos + normalize(end - start);
 
-	// beam effect
-	WriteByte (MSG_BROADCAST, SVC_TEMPENTITY);
-	WriteByte (MSG_BROADCAST, 76);
-	WriteCoord (MSG_BROADCAST, start_x);
-	WriteCoord (MSG_BROADCAST, start_y);
-	WriteCoord (MSG_BROADCAST, start_z);
-	WriteCoord (MSG_BROADCAST, end_x);
-	WriteCoord (MSG_BROADCAST, end_y);
-	WriteCoord (MSG_BROADCAST, end_z);
-	WriteCoord (MSG_BROADCAST, 0);
-	WriteCoord (MSG_BROADCAST, 0);
-	WriteCoord (MSG_BROADCAST, 0);
-
 	// flash and burn the wall
 	te_plasmaburn (trace_endpos);
 
diff --git a/qcsrc/gamec/w_nex.c b/qcsrc/gamec/w_nex.c
index 642a760d6..09a5536b0 100644
--- a/qcsrc/gamec/w_nex.c
+++ b/qcsrc/gamec/w_nex.c
@@ -36,16 +36,33 @@ void W_Nex_Attack (void)
 {
 	vector	org;
 	vector	dir;
+	vector end;
 	entity 	explosion;
 
 	sound (self, CHAN_WEAPON, "weapons/nexfire.wav", 1, ATTN_NORM);
 	self.punchangle_x = -4;
 	makevectors(self.v_angle);
-	org = self.origin + self.view_ofs + v_forward * 28 + v_right * 14 + v_up * -7;
-	te_smallflash(org);
+	org = self.origin + self.view_ofs + v_forward * 5 + v_right * 14 + v_up * -7;
 
 	FireRailgunBullet (org, self.origin + self.view_ofs + v_forward * 4096, cvar("g_balance_nex_damage"), IT_NEX);
 
+
+	org = self.origin + self.view_ofs + v_forward * 28 + v_right * 14 + v_up * -7;
+	end = self.origin + self.view_ofs + v_forward * 4096;
+	te_smallflash(org);
+		// beam effect
+	WriteByte (MSG_BROADCAST, SVC_TEMPENTITY);
+	WriteByte (MSG_BROADCAST, 76);
+	WriteCoord (MSG_BROADCAST, org_x);
+	WriteCoord (MSG_BROADCAST, org_y);
+	WriteCoord (MSG_BROADCAST, org_z);
+	WriteCoord (MSG_BROADCAST, end_x);
+	WriteCoord (MSG_BROADCAST, end_y);
+	WriteCoord (MSG_BROADCAST, end_z);
+	WriteCoord (MSG_BROADCAST, 0);
+	WriteCoord (MSG_BROADCAST, 0);
+	WriteCoord (MSG_BROADCAST, 0);
+
 	self.attack_finished = time + 1;
 
 	if (cvar("g_instagib") == 0)
-- 
2.39.2