From a613214e54bcf81ada08762e9277c58fbde19291 Mon Sep 17 00:00:00 2001
From: Magnus <magnus_ak@users.sourceforge.net>
Date: Fri, 6 Jan 2006 02:12:00 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1798 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 quakec/fallout2/client.qc  | 53 +++++++++++++++++++++-----------------
 quakec/fallout2/combat.qc  |  6 +++--
 quakec/fallout2/fight.qc   |  2 +-
 quakec/fallout2/weapons.qc |  2 +-
 4 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/quakec/fallout2/client.qc b/quakec/fallout2/client.qc
index 90bc513df..936dacd83 100644
--- a/quakec/fallout2/client.qc
+++ b/quakec/fallout2/client.qc
@@ -1203,6 +1203,35 @@ void() PlayerPreThink =
 	makevectors (self.v_angle);             // is this still used
 
 
+	if (self.cycle1 < time)
+	{
+		if (self.currentmenu != "none")
+			DisplayMenu();
+
+		//if (class == 0 || self.team == 0)
+		//	return;
+
+		Identify();
+		PositionControl();
+		SpeedControl();
+		WeightControl();
+		ArmorCheck();
+		Crosshair();
+
+		if (self.health > self.max_health)
+			self.health = self.max_health;
+
+
+		if (self.ragetime > time)
+			stuffcmd(self, "v_cshift 75 0 0 75\n");
+		else if (self.sneak > 0)
+			stuffcmd(self, "v_cshift 0 75 0 75\n");
+		else
+			stuffcmd(self, "v_cshift 0 0 0 0\n");
+
+		self.cycle1 = time + 0.5;
+	}
+
 	if (self.materialize > 0)
 	{
 		self.materialize = self.materialize - 1;
@@ -1248,30 +1277,6 @@ void() PlayerPreThink =
       self.deathtype = "";
 
 
-	if (self.cycle1 < time)
-	{
-		Identify();
-		PositionControl();
-		SpeedControl();
-		WeightControl();
-		ArmorCheck();
-		Crosshair();
-		if (self.currentmenu != "none")
-			DisplayMenu();
-
-		if (self.health > self.max_health)
-			self.health = self.max_health;
-
-
-		if (self.ragetime > time)
-			stuffcmd(self, "v_cshift 75 0 0 75\n");
-		else if (self.sneak > 0)
-			stuffcmd(self, "v_cshift 0 75 0 75\n");
-		else
-			stuffcmd(self, "v_cshift 0 0 0 0\n");
-
-		self.cycle1 = time + 0.5;
-	}
 
 	if (self.cycle2 < time)
 	{
diff --git a/quakec/fallout2/combat.qc b/quakec/fallout2/combat.qc
index 46c35b8d3..2a2b5f41f 100644
--- a/quakec/fallout2/combat.qc
+++ b/quakec/fallout2/combat.qc
@@ -300,13 +300,15 @@ void(entity targ, entity inflictor, entity attacker, float damage) T_Damage =
 		break;
 	}
 
-	if (damage <= 0)
+
+	if (take <= 0)
 	{
-		damage = 0;
+		take = 0;
 		sound (targ, CHAN_BODY, targ.armornoise, 1, ATTN_NORM);
 		return;
 	}
 
+
 	targ.health = targ.health - take;
 
 	if (targ.health <= 0)
diff --git a/quakec/fallout2/fight.qc b/quakec/fallout2/fight.qc
index 6843cfa8e..6deda3937 100644
--- a/quakec/fallout2/fight.qc
+++ b/quakec/fallout2/fight.qc
@@ -188,7 +188,7 @@ void() ai_melee =
 	if (vlen(delta) > 60)
 		return;
 		
-	ldmg = (random() + random() + random()) * 3;
+	ldmg = 6+random()*6;
 	T_Damage (self.enemy, self, self, ldmg);
 };
 
diff --git a/quakec/fallout2/weapons.qc b/quakec/fallout2/weapons.qc
index c5f57ffe4..650a8a65a 100644
--- a/quakec/fallout2/weapons.qc
+++ b/quakec/fallout2/weapons.qc
@@ -1094,7 +1094,7 @@ void() W_Attack =
 	else if (weap == IID_WP_DKS1)
 		FireAssaultRifle(30, 2, "weapons/dks-1.wav", 8000, 0.5);
 	else if (weap == IID_WP_MOONLIGHT)
-		FireAssaultRifle(16, 2, "weapons/m4a1.wav", 4000, 0.1);
+		FireAssaultRifle(16, 2, "weapons/m4-nw.wav", 4000, 0.1);
 
 //float IID_WP_SA80 = 420;
 //float IID_WP_GAUSERIFLE = 421;