Pass object &to bng_process_segment
This commit is contained in:
parent
d98505354d
commit
a18a483114
|
@ -1446,7 +1446,7 @@ void clear_stuck_objects(void)
|
||||||
// -----------------------------------------------------------------------------------
|
// -----------------------------------------------------------------------------------
|
||||||
#define MAX_BLAST_GLASS_DEPTH 5
|
#define MAX_BLAST_GLASS_DEPTH 5
|
||||||
|
|
||||||
static void bng_process_segment(const vobjptr_t objp, fix damage, const vsegptridx_t segp, int depth, visited_segment_bitarray_t &visited)
|
static void bng_process_segment(const object &objp, fix damage, const vsegptridx_t segp, int depth, visited_segment_bitarray_t &visited)
|
||||||
{
|
{
|
||||||
int i, sidenum;
|
int i, sidenum;
|
||||||
|
|
||||||
|
@ -1467,11 +1467,11 @@ static void bng_process_segment(const vobjptr_t objp, fix damage, const vsegptri
|
||||||
|
|
||||||
if ((((ec=TmapInfo[tm].eclip_num)!=-1) && ((db=Effects[ec].dest_bm_num)!=-1 && !(Effects[ec].flags&EF_ONE_SHOT))) || (ec==-1 && (TmapInfo[tm].destroyed!=-1))) {
|
if ((((ec=TmapInfo[tm].eclip_num)!=-1) && ((db=Effects[ec].dest_bm_num)!=-1 && !(Effects[ec].flags&EF_ONE_SHOT))) || (ec==-1 && (TmapInfo[tm].destroyed!=-1))) {
|
||||||
const auto pnt = compute_center_point_on_side(segp, sidenum);
|
const auto pnt = compute_center_point_on_side(segp, sidenum);
|
||||||
dist = vm_vec_dist_quick(pnt, objp->pos);
|
dist = vm_vec_dist_quick(pnt, objp.pos);
|
||||||
if (dist < damage/2) {
|
if (dist < damage/2) {
|
||||||
dist = find_connected_distance(pnt, segp, objp->pos, segp.absolute_sibling(objp->segnum), MAX_BLAST_GLASS_DEPTH, WID_RENDPAST_FLAG);
|
dist = find_connected_distance(pnt, segp, objp.pos, segp.absolute_sibling(objp.segnum), MAX_BLAST_GLASS_DEPTH, WID_RENDPAST_FLAG);
|
||||||
if ((dist > 0) && (dist < damage/2))
|
if ((dist > 0) && (dist < damage/2))
|
||||||
check_effect_blowup(segp, sidenum, pnt, vcobjptr(objp->ctype.laser_info.parent_num)->ctype.laser_info, 1, 0);
|
check_effect_blowup(segp, sidenum, pnt, vcobjptr(objp.ctype.laser_info.parent_num)->ctype.laser_info, 1, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue