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

Fold net_udp_send_door_updates calls to multi_send_door_open

Browse source
This commit is contained in:
Kp 2016-12-05 00:26:09 +00:00
parent b5be5f2099
commit 67afde75e3
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
similar/main/net_udp.cpp
View file

@ -1694,6 +1694,8 @@ int net_udp_objnum_is_past(objnum_t objnum)
return 0; return 0;
} }
namespace dsx {
#if defined(DXX_BUILD_DESCENT_I) #if defined(DXX_BUILD_DESCENT_I)
static void net_udp_send_door_updates(void) static void net_udp_send_door_updates(void)
{ {
@ -1701,9 +1703,7 @@ static void net_udp_send_door_updates(void)
range_for (const auto &&p, vcwallptridx) range_for (const auto &&p, vcwallptridx)
{ {
auto &w = *p; auto &w = *p;
if (w.type == WALL_DOOR && (w.state == WALL_DOOR_OPENING || w.state == WALL_DOOR_WAITING)) if ((w.type == WALL_DOOR && (w.state == WALL_DOOR_OPENING || w.state == WALL_DOOR_WAITING)) || (w.type == WALL_BLASTABLE && (w.flags & WALL_BLASTED)))
multi_send_door_open(w.segnum, w.sidenum,0);
else if (w.type == WALL_BLASTABLE && (w.flags & WALL_BLASTED))
multi_send_door_open(w.segnum, w.sidenum,0); multi_send_door_open(w.segnum, w.sidenum,0);
else if (w.type == WALL_BLASTABLE && w.hps != WALL_HPS) else if (w.type == WALL_BLASTABLE && w.hps != WALL_HPS)
multi_send_hostage_door_status(p); multi_send_hostage_door_status(p);
@ -1717,9 +1717,7 @@ static void net_udp_send_door_updates(const playernum_t pnum)
range_for (const auto &&p, vcwallptridx) range_for (const auto &&p, vcwallptridx)
{ {
auto &w = *p; auto &w = *p;
if (w.type == WALL_DOOR && (w.state == WALL_DOOR_OPENING || w.state == WALL_DOOR_WAITING || w.state == WALL_DOOR_OPEN)) if ((w.type == WALL_DOOR && (w.state == WALL_DOOR_OPENING || w.state == WALL_DOOR_WAITING || w.state == WALL_DOOR_OPEN)) || (w.type == WALL_BLASTABLE && (w.flags & WALL_BLASTED)))
multi_send_door_open_specific(pnum,w.segnum, w.sidenum,w.flags);
else if (w.type == WALL_BLASTABLE && (w.flags & WALL_BLASTED))
multi_send_door_open_specific(pnum,w.segnum, w.sidenum,w.flags); multi_send_door_open_specific(pnum,w.segnum, w.sidenum,w.flags);
else if (w.type == WALL_BLASTABLE && w.hps != WALL_HPS) else if (w.type == WALL_BLASTABLE && w.hps != WALL_HPS)
multi_send_hostage_door_status(p); multi_send_hostage_door_status(p);
@ -1729,6 +1727,8 @@ static void net_udp_send_door_updates(const playernum_t pnum)
} }
#endif #endif
}
static void net_udp_process_monitor_vector(uint32_t vector) static void net_udp_process_monitor_vector(uint32_t vector)
{ {
if (!vector) if (!vector)