diff --git a/main/collide.c b/main/collide.c index f9f98dc74..cb20d5d29 100644 --- a/main/collide.c +++ b/main/collide.c @@ -373,7 +373,7 @@ int check_effect_blowup(segment *seg,int side,vms_vector *pnt) //this can be blown up...did we hit it? - find_hitpoint_uv(&u,&v,pnt,seg,side,0); //evil: always say face zero + find_hitpoint_uv(&u,&v,NULL,pnt,seg,side,0); //evil: always say face zero x = ((unsigned) f2i(u*bm->bm_w)) % bm->bm_w; y = ((unsigned) f2i(v*bm->bm_h)) % bm->bm_h; diff --git a/main/fvi.c b/main/fvi.c index 8e892eaf2..a227f9c88 100644 --- a/main/fvi.c +++ b/main/fvi.c @@ -1093,8 +1093,9 @@ quit_looking: //finds the uv coords of the given point on the given seg & side //fills in u & v -void find_hitpoint_uv(fix *u,fix *v,vms_vector *pnt,segment *seg,int sidenum,int facenum) +void find_hitpoint_uv(fix *u,fix *v,fix *l,vms_vector *pnt,segment *seg,int sidenum,int facenum) { + (void)l; vms_vector_array *pnt_array; vms_vector_array normal_array; int segnum = seg-Segments; @@ -1179,7 +1180,7 @@ int check_trans_wall(vms_vector *pnt,segment *seg,int sidenum,int facenum) Assert(WALL_IS_DOORWAY(seg,sidenum) == WID_TRANSPARENT_WALL); - find_hitpoint_uv(&u,&v,pnt,seg,sidenum,facenum); + find_hitpoint_uv(&u,&v,NULL,pnt,seg,sidenum,facenum); if (side->tmap_num2 != 0) { bm = texmerge_get_cached_bitmap( side->tmap_num, side->tmap_num2 ); diff --git a/main/fvi.h b/main/fvi.h index 15500765f..b6812fd59 100644 --- a/main/fvi.h +++ b/main/fvi.h @@ -131,7 +131,7 @@ int find_vector_intersection(fvi_query *fq,fvi_info *hit_data); //finds the uv coords of the given point on the given seg & side //fills in u & v -void find_hitpoint_uv(fix *u,fix *v,vms_vector *pnt,segment *seg,int sidenum,int facenum); +void find_hitpoint_uv(fix *u,fix *v,fix *l,vms_vector *pnt,segment *seg,int sidenum,int facenum); //Returns true if the object is through any walls int object_intersects_wall(object *objp);