From 78ad83a134ef89baab358e545d0cf6d26aa1b719 Mon Sep 17 00:00:00 2001 From: zico Date: Mon, 31 Oct 2016 11:21:59 +0100 Subject: [PATCH] Fixed compile-time errors when using use_udp=0. Still some warnings but it builds. --- similar/main/multi.cpp | 6 ++++++ similar/misc/args.cpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp index 2b607d4c2..91e7ef327 100644 --- a/similar/main/multi.cpp +++ b/similar/main/multi.cpp @@ -467,6 +467,7 @@ int multi_objnum_is_past(objnum_t objnum) break; #endif default: + (void)objnum; Error("Protocol handling missing in multi_objnum_is_past\n"); break; } @@ -937,6 +938,7 @@ void multi_do_protocol_frame(int force, int listen) break; #endif default: + (void)force; (void)listen; Error("Protocol handling missing in multi_do_protocol_frame\n"); break; } @@ -1016,6 +1018,7 @@ void _multi_send_data(const ubyte *buf, unsigned len, int priority) break; #endif default: + (void)buf; (void)len; (void)priority; Error("Protocol handling missing in multi_send_data\n"); break; } @@ -1035,6 +1038,7 @@ static void _multi_send_data_direct(const ubyte *buf, unsigned len, const player break; #endif default: + (void)buf; (void)len; (void)priority; Error("Protocol handling missing in multi_send_data_direct\n"); break; } @@ -1124,6 +1128,7 @@ int multi_endlevel(int *const secret) break; #endif default: + (void)secret; Error("Protocol handling missing in multi_endlevel\n"); break; } @@ -1302,6 +1307,7 @@ static void kick_player(player &plr, netplayer_info &nplr) break; #endif default: + (void)nplr; Error("Protocol handling missing in multi_send_message_end\n"); break; } diff --git a/similar/misc/args.cpp b/similar/misc/args.cpp index 399175684..af688ad49 100644 --- a/similar/misc/args.cpp +++ b/similar/misc/args.cpp @@ -141,12 +141,14 @@ template E arg_enum(Arglist::iterator &pp, Arglist::const_iterator e return static_cast(arg_integer(pp, end)); } +#if DXX_USE_UDP static void arg_port_number(Arglist::iterator &pp, Arglist::const_iterator end, uint16_t &out, bool allow_privileged) { auto port = arg_integer(pp, end); if (static_cast(port) == port && (allow_privileged || port >= 1024)) out = port; } +#endif static void InitGameArg() {