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!
This commit is contained in:
Dabb 2001-03-05 11:48:20 +00:00
parent 4ae1fda2e1
commit c2cf684118

View file

@ -159,7 +159,7 @@ Cam_Lock (int playernum)
Sbar_Changed (); Sbar_Changed ();
} }
pmtrace_t trace_t
Cam_DoTrace (vec3_t vec1, vec3_t vec2) Cam_DoTrace (vec3_t vec1, vec3_t vec2)
{ {
#if 0 #if 0
@ -180,7 +180,7 @@ Cam_TryFlyby (player_state_t * self, player_state_t * player, vec3_t vec,
qboolean checkvis) qboolean checkvis)
{ {
vec3_t v; vec3_t v;
pmtrace_t trace; trace_t trace;
float len; float len;
vectoangles (vec, v); vectoangles (vec, v);
@ -213,7 +213,7 @@ Cam_TryFlyby (player_state_t * self, player_state_t * player, vec3_t vec,
static qboolean static qboolean
Cam_IsVisible (player_state_t * player, vec3_t vec) Cam_IsVisible (player_state_t * player, vec3_t vec)
{ {
pmtrace_t trace; trace_t trace;
vec3_t v; vec3_t v;
float d; float d;