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

Pass object &to blast_nearby_glass

Browse source
This commit is contained in:
Kp 2016-04-23 17:59:47 +00:00
parent a18a483114
commit 30230a8137
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/main/fwd-wall.h
View file

@ -274,7 +274,7 @@ void start_wall_decloak(vsegptridx_t seg, int side);
void cloaking_wall_read(cloaking_wall &cw, PHYSFS_File *fp);
void cloaking_wall_write(const cloaking_wall &cw, PHYSFS_File *fp);
#endif
void blast_nearby_glass(vobjptr_t objp, fix damage);
void blast_nearby_glass(const object &objp, fix damage);
#endif
void wclip_read(PHYSFS_File *, wclip &wc);

8
similar/main/wall.cpp
View file

@ -1448,6 +1448,7 @@ void clear_stuck_objects(void)
static void bng_process_segment(const object &objp, fix damage, const vsegptridx_t segp, int depth, visited_segment_bitarray_t &visited)
{
visited[segp] = true;
int i, sidenum;
if (depth > MAX_BLAST_GLASS_DEPTH)
@ -1483,7 +1484,6 @@ static void bng_process_segment(const object &objp, fix damage, const vsegptridx
if (segnum != segment_none) {
if (!visited[segnum]) {
if (WALL_IS_DOORWAY(segp, i) & WID_FLY_FLAG) {
visited[segnum] = true;
bng_process_segment(objp, damage, segp.absolute_sibling(segnum), depth, visited);
}
}
@ -1494,12 +1494,10 @@ static void bng_process_segment(const object &objp, fix damage, const vsegptridx
// -----------------------------------------------------------------------------------
// objp is going to detonate
// blast nearby monitors, lights, maybe other things
void blast_nearby_glass(const vobjptr_t objp, fix damage)
void blast_nearby_glass(const object &objp, fix damage)
{
visited_segment_bitarray_t visited;
visited[objp->segnum] = true;
bng_process_segment(objp, damage, vsegptridx(objp->segnum), 0, visited);
bng_process_segment(objp, damage, vsegptridx(objp.segnum), 0, visited);
}
struct d1wclip