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

Expand NET_DUMP_STRINGS inline 

It is only used in one place, so expand it there.
This commit is contained in:
Kp 2023-07-08 18:26:21 +00:00
parent c81fa4073b
commit a7df75a028
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/main/text.h
View File

@ -1247,16 +1247,6 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
(dxx_text_ensure_simple_expr(&(u), TXT_W_C_MISSILE_S)) \
)
#define NET_DUMP_STRINGS(u) ( \
((u) == kick_player_reason::closed) ? TXT_NET_GAME_CLOSED : \
((u) == kick_player_reason::full) ? TXT_NET_GAME_FULL : \
((u) == kick_player_reason::endlevel) ? TXT_NET_GAME_BETWEEN : \
((u) == kick_player_reason::dork) ? TXT_NET_GAME_NSELECT : \
((u) == kick_player_reason::aborted) ? TXT_NET_GAME_NSTART : \
((u) == kick_player_reason::connected) ? TXT_NET_GAME_CONNECT : \
((u) == kick_player_reason::level) ? TXT_NET_GAME_WRONGLEV : \
(dxx_text_ensure_simple_expr(&(u), TXT_NET_GAME_CLOSED)) \
)
#define MENU_DIFFICULTY_TEXT(u) ( \
((u) == Difficulty_level_type::_0) ? TXT_DIFFICULTY_1 : \
((u) == Difficulty_level_type::_1) ? TXT_DIFFICULTY_2 : \

37
similar/main/net_udp.cpp
View File

@ -3282,11 +3282,11 @@ static void net_udp_process_dump(const upid_rspan<upid::dump> data, const _socka
// Our request for join was denied. Tell the user why.
if (sender_addr != Netgame.players[0].protocol.udp.addr)
return;
const auto why = build_kick_player_reason_from_untrusted(data[1]);
if (!why)
const auto untrusted_why = build_kick_player_reason_from_untrusted(data[1]);
if (!untrusted_why)
/* If the peer sent an invalid kick_player_reason, ignore the kick. */
return;
switch (*why)
switch (const auto why = *untrusted_why)
{
case kick_player_reason::pkttimeout:
case kick_player_reason::kicked:
@ -3313,7 +3313,36 @@ static void net_udp_process_dump(const upid_rspan<upid::dump> data, const _socka
case kick_player_reason::connected:
case kick_player_reason::level:
Network_status = network_state::menu; // stop us from sending before message
nm_messagebox_str(menu_title{nullptr}, TXT_OK, menu_subtitle{NET_DUMP_STRINGS(why)});
{
const char *dump_string;
switch (why)
{
case kick_player_reason::kicked: // unreachable
case kick_player_reason::pkttimeout: // unreachable
case kick_player_reason::closed: // reachable
dump_string = TXT_NET_GAME_CLOSED;
break;
case kick_player_reason::full:
dump_string = TXT_NET_GAME_FULL;
break;
case kick_player_reason::endlevel:
dump_string = TXT_NET_GAME_BETWEEN;
break;
case kick_player_reason::dork:
dump_string = TXT_NET_GAME_NSELECT;
break;
case kick_player_reason::aborted:
dump_string = TXT_NET_GAME_NSTART;
break;
case kick_player_reason::connected:
dump_string = TXT_NET_GAME_CONNECT;
break;
case kick_player_reason::level:
dump_string = TXT_NET_GAME_WRONGLEV;
break;
}
nm_messagebox_str(menu_title{nullptr}, TXT_OK, menu_subtitle{dump_string});
}
Network_status = network_state::menu;
multi_reset_stuff();
break;