From cbbb790bb61a851df99961fd8adfacf7fd2854bb Mon Sep 17 00:00:00 2001
From: Finny Merrill <griever@users.sourceforge.net>
Date: Mon, 1 Dec 2003 22:48:14 +0000
Subject: [PATCH] Removed lastframe_time because frametime does what I want (I
 hope).

---
 client.qc  | 4 +---
 defs.qc    | 1 -
 weapons.qc | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/client.qc b/client.qc
index 91b7166..e05cb3f 100644
--- a/client.qc
+++ b/client.qc
@@ -3135,7 +3135,7 @@ void() PlayerPostThink =
 		}
 		else 
 #ifdef WALL_HURT
-		if (vlen(self.movedir) - vlen(self.velocity) > 5500 * (time - self.lastframe_time))
+		if (vlen(self.movedir) - vlen(self.velocity) > 5500 * frametime)
 		{
 			self.deathtype = "wall";
 			T_Damage (self, NIL, NIL, ((vlen(self.movedir) - vlen(self.velocity)) - 550) / 10);
@@ -3182,8 +3182,6 @@ void() PlayerPostThink =
 
 		self.cheat_check = time + 5;	
 	}
-
-	self.lastframe_time = time;	
 };
 
 
diff --git a/defs.qc b/defs.qc
index b2a9b06..cb0c351 100644
--- a/defs.qc
+++ b/defs.qc
@@ -282,7 +282,6 @@ float		deathmatch;
 
 .float	search_time; 		//WK Used for hover boots. :/
 .float	attack_state;		//WK Not usable?
-.float  lastframe_time;
 
 //
 // player only fields
diff --git a/weapons.qc b/weapons.qc
index b460d92..9689932 100644
--- a/weapons.qc
+++ b/weapons.qc
@@ -4048,7 +4048,7 @@ void() W_WeaponFrame =
 
 	if (!(self.tfstate & TFSTATE_AIMING)) {
 		if (self.height > 29 && self.height < 90) {
-			self.height = self.height + 80 * (time - self.lastframe_time);
+			self.height = self.height + 80 * frametime;
 			if (self.height > 90)
 				self.height = 90;
 
@@ -4103,7 +4103,7 @@ void() W_WeaponFrame =
 	}
 
 	if (self.current_weapon == WEAP_AUTO_RIFLE) // BUG BUG BUG! GIVES ADVANTAGE TO HIGH FPSERS
-	    self.heat -= 1000 * (time - self.lastframe_time);
+	    self.heat -= 1000 * frametime;
 	// check for attack
     if (self.button0 && !(self.fire_held_down)) {
 		if ((self.current_menu == MENU_CLASSHELP) || (self.current_menu == MENU_CLASSHELP2)) {