TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add unused fix *l to find_hitpoint_uv to match D2X

Browse source
This commit is contained in:
Kp 2013-03-23 02:32:02 +00:00
parent ce9b985d33
commit 2a6c8a1574
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/collide.c
View file

@ -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;

5
main/fvi.c
View file

@ -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 );

2
main/fvi.h
View file

@ -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);