From c2cf6841180ed2de5b85d18a3ed9949d3d0da08d Mon Sep 17 00:00:00 2001
From: Dabb <dabb@users.sourceforge.net>
Date: Mon, 5 Mar 2001 11:48:20 +0000
Subject: [PATCH] Hullcheck client/server duplicate merge. mtrace_t replaced by
 trace_t with ent->entnum change pmplane_t replaced by plane_t Might even
 break something!

---
 source/cl_cam.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/cl_cam.c b/source/cl_cam.c
index 6a66f84..5c1c2fd 100644
--- a/source/cl_cam.c
+++ b/source/cl_cam.c
@@ -159,7 +159,7 @@ Cam_Lock (int playernum)
 	Sbar_Changed ();
 }
 
-pmtrace_t
+trace_t
 Cam_DoTrace (vec3_t vec1, vec3_t vec2)
 {
 #if 0
@@ -180,7 +180,7 @@ Cam_TryFlyby (player_state_t * self, player_state_t * player, vec3_t vec,
 			  qboolean checkvis)
 {
 	vec3_t      v;
-	pmtrace_t   trace;
+	trace_t   trace;
 	float       len;
 
 	vectoangles (vec, v);
@@ -213,7 +213,7 @@ Cam_TryFlyby (player_state_t * self, player_state_t * player, vec3_t vec,
 static qboolean
 Cam_IsVisible (player_state_t * player, vec3_t vec)
 {
-	pmtrace_t   trace;
+	trace_t   trace;
 	vec3_t      v;
 	float       d;