From 7c76c6825510cd657cb602e068bd96acc1e9eed1 Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 16 Oct 2014 02:13:09 +0000 Subject: [PATCH] Make unused_newmenu_userdata_t const --- common/main/multi.h | 4 ++-- common/main/net_udp.h | 4 ++-- common/main/newmenu.h | 4 ++-- similar/main/game.cpp | 2 +- similar/main/menu.cpp | 10 +++++----- similar/main/multi.cpp | 4 ++-- similar/main/net_udp.cpp | 12 ++++++------ 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/common/main/multi.h b/common/main/multi.h index da73a3af7..a64537869 100644 --- a/common/main/multi.h +++ b/common/main/multi.h @@ -267,8 +267,8 @@ void multi_consistency_error(int reset); void multi_prep_level(void); int multi_level_sync(void); int multi_endlevel(int *secret); -int multi_endlevel_poll1(newmenu *menu,const d_event &event, unused_newmenu_userdata_t *userdata); -int multi_endlevel_poll2( newmenu *menu,const d_event &event, unused_newmenu_userdata_t *userdata ); +int multi_endlevel_poll1(newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *); +int multi_endlevel_poll2( newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *); void multi_send_endlevel_packet(); void multi_leave_game(void); void multi_process_bigdata(playernum_t pnum, const ubyte *buf, uint_fast32_t len); diff --git a/common/main/net_udp.h b/common/main/net_udp.h index ba8fce8de..10bd0665b 100644 --- a/common/main/net_udp.h +++ b/common/main/net_udp.h @@ -26,8 +26,8 @@ void net_udp_do_frame(int force, int listen); void net_udp_send_data(const ubyte * ptr, int len, int priority ); void net_udp_leave_game(); int net_udp_endlevel(int *secret); -int net_udp_kmatrix_poll1( newmenu *menu,const d_event &event, unused_newmenu_userdata_t *userdata ); -int net_udp_kmatrix_poll2( newmenu *menu,const d_event &event, unused_newmenu_userdata_t *userdata ); +int net_udp_kmatrix_poll1( newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *); +int net_udp_kmatrix_poll2( newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *); void net_udp_send_endlevel_packet(); void net_udp_dump_player(struct _sockaddr dump_addr, int why); void net_udp_disconnect_player(int playernum); diff --git a/common/main/newmenu.h b/common/main/newmenu.h index e39b0b746..84811a195 100644 --- a/common/main/newmenu.h +++ b/common/main/newmenu.h @@ -74,8 +74,8 @@ public: typedef newmenu_subfunction_t::type newmenu_subfunction; class unused_newmenu_userdata_t; -static const newmenu_subfunction_t::type unused_newmenu_subfunction = NULL; -static unused_newmenu_userdata_t *const unused_newmenu_userdata = NULL; +static const newmenu_subfunction_t::type unused_newmenu_subfunction = nullptr; +static const unused_newmenu_userdata_t *const unused_newmenu_userdata = nullptr; int newmenu_do2(const char *title, const char *subtitle, int nitems, newmenu_item *item, newmenu_subfunction subfunction, void *userdata, int citem, const char *filename); diff --git a/similar/main/game.cpp b/similar/main/game.cpp index baec21aac..df2da8610 100644 --- a/similar/main/game.cpp +++ b/similar/main/game.cpp @@ -792,7 +792,7 @@ void full_palette_save(void) #define EXT_MUSIC_TEXT "Audio CD" #endif -static int free_help(newmenu *menu,const d_event &event, unused_newmenu_userdata_t *userdata) +static int free_help(newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *) { if (event.type == EVENT_WINDOW_CLOSE) { diff --git a/similar/main/menu.cpp b/similar/main/menu.cpp index 9a8da933f..3617af63d 100644 --- a/similar/main/menu.cpp +++ b/similar/main/menu.cpp @@ -864,7 +864,7 @@ static void change_res(); static void graphics_config(); static void do_misc_menu(); -static int options_menuset(newmenu *menu,const d_event &event, unused_newmenu_userdata_t *) +static int options_menuset(newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *) { switch (event.type) { @@ -1064,7 +1064,7 @@ static void input_config_sensitivity() } static int opt_ic_usejoy = 0, opt_ic_usemouse = 0, opt_ic_confkey = 0, opt_ic_confjoy = 0, opt_ic_confmouse = 0, opt_ic_confweap = 0, opt_ic_mouseflightsim = 0, opt_ic_joymousesens = 0, opt_ic_grabinput = 0, opt_ic_mousefsgauge = 0, opt_ic_help0 = 0, opt_ic_help1 = 0, opt_ic_help2 = 0; -static int input_config_menuset(newmenu *menu,const d_event &event, unused_newmenu_userdata_t *) +static int input_config_menuset(newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *) { newmenu_item *items = newmenu_get_items(menu); int citem = newmenu_get_citem(menu); @@ -1214,7 +1214,7 @@ int opt_gr_texfilt, opt_gr_brightness, opt_gr_reticlemenu, opt_gr_alphafx, opt_g #if defined(DXX_BUILD_DESCENT_II) int opt_gr_movietexfilt; #endif -static int graphics_config_menuset(newmenu *menu,const d_event &event, unused_newmenu_userdata_t *) +static int graphics_config_menuset(newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *) { newmenu_item *items = newmenu_get_items(menu); int citem = newmenu_get_citem(menu); @@ -1597,7 +1597,7 @@ static int get_absolute_path(char *full_path, const char *rel_path) #define SELECT_SONG(t, s) select_file_recursive(t, GameCfg.CMMiscMusic[s], jukebox_exts, 0, get_absolute_path, GameCfg.CMMiscMusic[s]) #endif -static int sound_menuset(newmenu *menu,const d_event &event, unused_newmenu_userdata_t *) +static int sound_menuset(newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *) { newmenu_item *items = newmenu_get_items(menu); int citem = newmenu_get_citem(menu); @@ -2173,7 +2173,7 @@ static void gamebitmaps_viewer() event_process(); } -static int sandbox_menuset(newmenu *menu,const d_event &event, unused_newmenu_userdata_t *) +static int sandbox_menuset(newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *) { switch (event.type) { diff --git a/similar/main/multi.cpp b/similar/main/multi.cpp index 84acb9872..cfb4953fd 100644 --- a/similar/main/multi.cpp +++ b/similar/main/multi.cpp @@ -988,7 +988,7 @@ multi_endlevel(int *secret) return(result); } -int multi_endlevel_poll1( newmenu *menu,const d_event &event, unused_newmenu_userdata_t *userdata ) +int multi_endlevel_poll1( newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *userdata) { switch (multi_protocol) { @@ -1005,7 +1005,7 @@ int multi_endlevel_poll1( newmenu *menu,const d_event &event, unused_newmenu_use return 0; // kill warning } -int multi_endlevel_poll2( newmenu *menu,const d_event &event, unused_newmenu_userdata_t *userdata ) +int multi_endlevel_poll2( newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *userdata) { switch (multi_protocol) { diff --git a/similar/main/net_udp.cpp b/similar/main/net_udp.cpp index 7218818fe..94e53be88 100644 --- a/similar/main/net_udp.cpp +++ b/similar/main/net_udp.cpp @@ -97,7 +97,7 @@ static void net_udp_noloss_process_queue(fix64 time); static void net_udp_send_extras (); static void net_udp_broadcast_game_info(ubyte info_upid); static void net_udp_process_game_info(ubyte *data, int data_len, struct _sockaddr game_addr, int lite_info); -static int net_udp_more_options_handler( newmenu *menu,const d_event &event, unused_newmenu_userdata_t *userdata ); +static int net_udp_more_options_handler( newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *); static int net_udp_start_game(void); // Variables @@ -1102,7 +1102,7 @@ void net_udp_close() } // Send PID_ENDLEVEL in regular intervals and listen for them (host also does the packets for playing clients) -int net_udp_kmatrix_poll1( newmenu *,const d_event &event, unused_newmenu_userdata_t *) +int net_udp_kmatrix_poll1( newmenu *,const d_event &event, const unused_newmenu_userdata_t *) { // Polling loop for End-of-level menu if (event.type != EVENT_WINDOW_DRAW) @@ -1113,7 +1113,7 @@ int net_udp_kmatrix_poll1( newmenu *,const d_event &event, unused_newmenu_userda } // Same as above but used when player pressed ESC during kmatrix (host also does the packets for playing clients) -int net_udp_kmatrix_poll2( newmenu *,const d_event &event, unused_newmenu_userdata_t *) +int net_udp_kmatrix_poll2( newmenu *,const d_event &event, const unused_newmenu_userdata_t *) { int rval = 0; @@ -2770,7 +2770,7 @@ void net_udp_read_endlevel_packet( ubyte *data, int data_len, struct _sockaddr s /* * Polling loop waiting for sync packet to start game after having sent request */ -static int net_udp_sync_poll( newmenu *,const d_event &event, unused_newmenu_userdata_t *) +static int net_udp_sync_poll( newmenu *,const d_event &event, const unused_newmenu_userdata_t *) { static fix64 t1 = 0; int rval = 0; @@ -2986,7 +2986,7 @@ menu: Difficulty_level = Netgame.difficulty; } -static int net_udp_more_options_handler( newmenu *menu,const d_event &event, unused_newmenu_userdata_t *) +static int net_udp_more_options_handler( newmenu *menu,const d_event &event, const unused_newmenu_userdata_t *) { newmenu_item *menus = newmenu_get_items(menu); int citem = newmenu_get_citem(menu); @@ -3809,7 +3809,7 @@ static int net_udp_wait_for_sync(void) return(0); } -static int net_udp_request_poll( newmenu *,const d_event &event, unused_newmenu_userdata_t *) +static int net_udp_request_poll( newmenu *,const d_event &event, const unused_newmenu_userdata_t *) { // Polling loop for waiting-for-requests menu int num_ready = 0;