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

Move NETFLAG_DOPOWERUP to netgame_info and clarify name

Browse source
This commit is contained in:
Kp 2021-01-25 00:45:07 +00:00
parent 81a2d92ee9
commit 1afd0eeae2
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/main/multi.h
View file

@ -237,7 +237,6 @@ constexpr std::integral_constant<unsigned, 21> MULTI_ALLOW_POWERUP_TEXT_LENGTH{}
#endif
namespace multi {
using endlevel_poll_function_type = int(newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *);
struct dispatch_table
{
constexpr const dispatch_table *operator->() const
@ -270,7 +269,6 @@ enum netflag_flag :
{
for_each_netflag_value(define_netflag_bit_mask)
};
enum { NETFLAG_DOPOWERUP = 0 for_each_netflag_value(define_netflag_powerup_mask) };
enum {
BIT_NETGRANT_LASER = DXX_GRANT_LASER_LEVEL_BITS - 1,
for_each_netgrant_value(define_netflag_bit_enum)
@ -287,7 +285,6 @@ enum netgrant_flag :
};
#undef define_netflag_bit_enum
#undef define_netflag_bit_mask
#undef define_netflag_powerup_mask
namespace dsx {
@ -788,6 +785,8 @@ namespace dsx {
*/
struct netgame_info : prohibit_void_ptr<netgame_info>
{
static constexpr std::integral_constant<unsigned, (0 for_each_netflag_value(define_netflag_powerup_mask))> MaskAllKnownAllowedItems{};
#undef define_netflag_powerup_mask
using play_time_allowed_abi_ratio = std::ratio<5 * 60>;
#if DXX_USE_UDP
union

4
similar/main/net_udp.cpp
View file

@ -3455,7 +3455,7 @@ int netgame_powerups_allowed_menu::subfunction_handler(const d_event &event)
for (auto &&[mi, i] : enumerate(m))
if (mi.value)
AllowedItems |= (1 << i);
Netgame.AllowedItems = (Netgame.AllowedItems & ~NETFLAG_DOPOWERUP) | AllowedItems;
Netgame.AllowedItems = AllowedItems;
break;
}
default:
@ -4040,7 +4040,7 @@ window_event_result net_udp_setup_game()
Netgame.BrightPlayers = 1;
Netgame.InvulAppear = 4;
Netgame.SecludedSpawns = MAX_PLAYERS - 1;
Netgame.AllowedItems = NETFLAG_DOPOWERUP;
Netgame.AllowedItems = Netgame.MaskAllKnownAllowedItems;
Netgame.PacketLossPrevention = 1;
Netgame.NoFriendlyFire = 0;
Netgame.MouselookFlags = 0;