From 7c8c2b5aa492b79118053919367e0b540cd7c72d Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 11 Sep 2016 18:49:15 +0000 Subject: [PATCH] Move USE_TRACKER to dxxsconf.h; rename to DXX_USE_TRACKER Rename symbol USE_TRACKER to DXX_USE_TRACKER to show that it is a DXX symbol, not one inherited from a library. Move it to dxxsconf.h to shorten the command line. This is a mostly automated transform, but the changes to SConstruct were manual. git grep -l USE_TRACKER -- '*.h' '*.cpp' | xargs sed -i -e 's/^#ifdef \(USE_TRACKER\)$/#if DXX_\1/' -e 's/#\(el\)\?if \(.*\)defined(\(USE_TRACKER\))/#\1if \2DXX_\3/' --- SConstruct | 8 +++++--- common/include/args.h | 2 +- common/main/multi.h | 2 +- common/main/net_udp.h | 4 ++-- similar/main/menu.cpp | 2 +- similar/main/net_udp.cpp | 26 +++++++++++++------------- similar/main/playsave.cpp | 4 ++-- similar/misc/args.cpp | 6 +++--- 8 files changed, 28 insertions(+), 26 deletions(-) diff --git a/SConstruct b/SConstruct index a5d7663cd..3039bd5e7 100644 --- a/SConstruct +++ b/SConstruct @@ -825,8 +825,10 @@ int main(int argc,char**argv){(void)argc;(void)argv; return self.successful_flags['CPPDEFINES'].extend(CPPDEFINES) Result(s % self.msgprefix) - def _result_check_user_setting(self,context,condition,CPPDEFINES,label): - if condition: + def _result_check_user_setting(self,context,condition,CPPDEFINES,label,int=int,str=str): + if isinstance(CPPDEFINES, str): + context.sconf.Define(CPPDEFINES, int(condition)) + elif condition: self.successful_flags['CPPDEFINES'].extend(CPPDEFINES) context.Result('%s: checking whether to enable %s...%s' % (self.msgprefix, label, 'yes' if condition else 'no')) @_custom_test @@ -845,7 +847,7 @@ int main(int argc,char**argv){(void)argc;(void)argv; def _check_user_settings_udp(self,context,_CPPDEFINES=(('USE_UDP',),)): self._result_check_user_setting(context, self.user_settings.use_udp, _CPPDEFINES, 'multiplayer over UDP') @_custom_test - def _check_user_settings_tracker(self,context,_CPPDEFINES=(('USE_TRACKER',),)): + def _check_user_settings_tracker(self,context,_CPPDEFINES='DXX_USE_TRACKER'): self._result_check_user_setting(context, self.user_settings.use_tracker, _CPPDEFINES, 'UDP game tracker') @_custom_test def check_libphysfs(self,context,_header=('physfs.h',)): diff --git a/common/include/args.h b/common/include/args.h index 6854c913a..8fd5c41e6 100644 --- a/common/include/args.h +++ b/common/include/args.h @@ -118,7 +118,7 @@ struct CArg : prohibit_void_ptr int SysMaxFPS; uint16_t MplUdpHostPort; uint16_t MplUdpMyPort; -#ifdef USE_TRACKER +#if DXX_USE_TRACKER uint16_t MplTrackerPort; std::string MplTrackerAddr; #endif diff --git a/common/main/multi.h b/common/main/multi.h index ae2443951..ac2e48a7d 100644 --- a/common/main/multi.h +++ b/common/main/multi.h @@ -881,7 +881,7 @@ struct netgame_info : prohibit_void_ptr, ignore_window_pointer_t array player_score; array net_player_flags; array players; -#ifdef USE_TRACKER +#if DXX_USE_TRACKER ubyte Tracker; #endif }; diff --git a/common/main/net_udp.h b/common/main/net_udp.h index 8d808682f..ff653b3ea 100644 --- a/common/main/net_udp.h +++ b/common/main/net_udp.h @@ -52,7 +52,7 @@ void net_udp_send_netgame_update(); // Our default port - easy to remember: D = 4, X = 24, X = 24 constexpr uint16_t UDP_PORT_DEFAULT = 42424; #define UDP_MANUAL_ADDR_DEFAULT "localhost" -#ifdef USE_TRACKER +#if DXX_USE_TRACKER #ifndef TRACKER_ADDR_DEFAULT /* Allow an alternate default at compile time */ #define TRACKER_ADDR_DEFAULT "dxxtracker.reenigne.net" @@ -100,7 +100,7 @@ constexpr uint16_t TRACKER_PORT_DEFAULT = 42420; #define UPID_MDATA_ACK 19 // ACK packet for UPID_MDATA_P1. #define UPID_MAX_SIZE 1024 // Max size for a packet #define UPID_MDATA_BUF_SIZE 454 -#ifdef USE_TRACKER +#if DXX_USE_TRACKER # define UPID_TRACKER_VERIFY 21 // The tracker has successfully gotten a hold of us # define UPID_TRACKER_INCGAME 22 // The tracker is sending us some game info #endif diff --git a/similar/main/menu.cpp b/similar/main/menu.cpp index 543e64862..c6e472d50 100644 --- a/similar/main/menu.cpp +++ b/similar/main/menu.cpp @@ -2263,7 +2263,7 @@ void do_multi_player_menu() #ifdef USE_UDP ADD_ITEM("HOST GAME", MENU_START_UDP_NETGAME, -1); -#ifdef USE_TRACKER +#if DXX_USE_TRACKER ADD_ITEM("FIND LAN/ONLINE GAMES", MENU_JOIN_LIST_UDP_NETGAME, -1); #else ADD_ITEM("FIND LAN GAMES", MENU_JOIN_LIST_UDP_NETGAME, -1); diff --git a/similar/main/net_udp.cpp b/similar/main/net_udp.cpp index eb9bf0535..f57a120f3 100644 --- a/similar/main/net_udp.cpp +++ b/similar/main/net_udp.cpp @@ -143,7 +143,7 @@ static sockaddr_in6 GMcast_v6; // same for IPv6-only #else #define dispatch_sockaddr_from from.sin #endif -#ifdef USE_TRACKER +#if DXX_USE_TRACKER static _sockaddr TrackerSocket; static int iTrackerVerified; constexpr int require_tracker_socket = 1; @@ -721,7 +721,7 @@ static int udp_receive_packet(RAIIsocket &sock, ubyte *text, int len, struct _so /* General UDP functions - END */ /* Tracker stuff, begin! */ -#ifdef USE_TRACKER +#if DXX_USE_TRACKER /* Tracker defines: System stuff */ #define TRACKER_SYS_VERSION 0x00 /* Tracker protocol version */ @@ -1139,7 +1139,7 @@ static int net_udp_list_join_poll( newmenu *menu,const d_event &event, direct_jo #endif break; } -#ifdef USE_TRACKER +#if DXX_USE_TRACKER if( key == KEY_F6 ) { // Zero the list @@ -3041,7 +3041,7 @@ static void net_udp_process_packet(ubyte *data, const _sockaddr &sender_addr, in case UPID_MDATA_ACK: net_udp_noloss_got_ack(data, length); break; -#ifdef USE_TRACKER +#if DXX_USE_TRACKER case UPID_TRACKER_VERIFY: iTrackerVerified = 1; break; @@ -3238,7 +3238,7 @@ static int net_udp_start_poll(newmenu *, const d_event &event, start_poll_menu_i return 0; } -#ifdef USE_TRACKER +#if DXX_USE_TRACKER #define DXX_UDP_MENU_TRACKER_OPTION(VERB) \ DXX_MENUITEM(VERB, CHECK, "Track this game on", opt_tracker, Netgame.Tracker) \ DXX_MENUITEM(VERB, TEXT, tracker_addr_txt, opt_tracker_addr) @@ -3364,7 +3364,7 @@ class more_game_options_menu_items #if defined(DXX_BUILD_DESCENT_II) char extraAccessory[sizeof("Accessories: 0")]; #endif -#ifdef USE_TRACKER +#if DXX_USE_TRACKER char tracker_addr_txt[sizeof("65535") + 28]; #endif typedef array menu_array; @@ -3468,7 +3468,7 @@ public: update_extra_primary_string(primary); update_extra_secondary_string(secondary); DXX_UDP_MENU_OPTIONS(ADD); -#ifdef USE_TRACKER +#if DXX_USE_TRACKER const auto &tracker_addr = CGameArg.MplTrackerAddr; if (tracker_addr.empty()) { @@ -3862,7 +3862,7 @@ int net_udp_setup_game() Netgame.PacketLossPrevention = 1; Netgame.NoFriendlyFire = 0; -#ifdef USE_TRACKER +#if DXX_USE_TRACKER Netgame.Tracker = 1; #endif @@ -3952,7 +3952,7 @@ int net_udp_setup_game() net_udp_close(); write_netgame_profile(&Netgame); -#ifdef USE_TRACKER +#if DXX_USE_TRACKER /* Force off _after_ writing profile, so that command line does not * change ngp file. */ @@ -4263,7 +4263,7 @@ static int net_udp_select_players() snprintf(title, sizeof(title), "%s %d %s", TXT_TEAM_SELECT, Netgame.max_numplayers, TXT_TEAM_PRESS_ENTER); GetPlayersAgain: -#ifdef USE_TRACKER +#if DXX_USE_TRACKER if( Netgame.Tracker ) udp_tracker_register(); #endif @@ -4276,7 +4276,7 @@ GetPlayersAgain: { // Aborted! // Dump all players and go back to menu mode -#ifdef USE_TRACKER +#if DXX_USE_TRACKER if( Netgame.Tracker ) udp_tracker_unregister(); #endif @@ -4640,7 +4640,7 @@ void net_udp_leave_game() } net_udp_broadcast_game_info(UPID_GAME_INFO_LITE); N_players=nsave; -#ifdef USE_TRACKER +#if DXX_USE_TRACKER if( Netgame.Tracker ) udp_tracker_unregister(); #endif @@ -4795,7 +4795,7 @@ void net_udp_do_frame(int force, int listen) net_udp_broadcast_game_info(UPID_GAME_INFO_LITE); } -#ifdef USE_TRACKER +#if DXX_USE_TRACKER // If we use the tracker, tell the tracker about us every 10 seconds if( Netgame.Tracker ) { diff --git a/similar/main/playsave.cpp b/similar/main/playsave.cpp index 27cf61f72..0515e4ef7 100644 --- a/similar/main/playsave.cpp +++ b/similar/main/playsave.cpp @@ -1442,7 +1442,7 @@ void read_netgame_profile(netgame_info *ng) convert_integer(ng->PacketsPerSec, value); else if (cmp(lb, eq, NoFriendlyFireStr)) convert_integer(ng->NoFriendlyFire, value); -#ifdef USE_TRACKER +#if DXX_USE_TRACKER else if (cmp(lb, eq, TrackerStr)) convert_integer(ng->Tracker, value); #endif @@ -1480,7 +1480,7 @@ void write_netgame_profile(netgame_info *ng) PHYSFSX_printf(file, ControlInvulTimeStr "=%i\n", ng->control_invul_time); PHYSFSX_printf(file, PacketsPerSecStr "=%i\n", ng->PacketsPerSec); PHYSFSX_printf(file, NoFriendlyFireStr "=%i\n", ng->NoFriendlyFire); -#ifdef USE_TRACKER +#if DXX_USE_TRACKER PHYSFSX_printf(file, TrackerStr "=%i\n", ng->Tracker); #else PHYSFSX_printf(file, TrackerStr "=0\n"); diff --git a/similar/misc/args.cpp b/similar/misc/args.cpp index ee899ec4e..54e732e4f 100644 --- a/similar/misc/args.cpp +++ b/similar/misc/args.cpp @@ -155,7 +155,7 @@ static void InitGameArg() #endif #ifdef USE_UDP CGameArg.MplUdpHostAddr = UDP_MANUAL_ADDR_DEFAULT; -#ifdef USE_TRACKER +#if DXX_USE_TRACKER CGameArg.MplTrackerAddr = TRACKER_ADDR_DEFAULT; CGameArg.MplTrackerPort = TRACKER_PORT_DEFAULT; #endif @@ -313,11 +313,11 @@ static void ReadCmdArgs(Inilist &ini, Arglist &Args) { /* Always recognized. No-op if tracker support compiled * out. */ -#ifdef USE_TRACKER +#if DXX_USE_TRACKER CGameArg.MplTrackerAddr.clear(); #endif } -#ifdef USE_TRACKER +#if DXX_USE_TRACKER else if (!d_stricmp(p, "-tracker_hostaddr")) { CGameArg.MplTrackerAddr = arg_string(pp, end);