From 4705c3f2d8852052ac95b2bed75db907c2247fe1 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Sun, 18 Jan 2015 01:58:31 +0000
Subject: [PATCH] Pass nm_set_item_checkbox arg by &

---
 common/main/newmenu.h     | 11 ++++++-----
 similar/main/gamecntl.cpp |  6 +++---
 similar/main/menu.cpp     | 31 ++++++++++++++++++-------------
 similar/main/net_udp.cpp  |  4 ++--
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/common/main/newmenu.h b/common/main/newmenu.h
index 80694f0d3..925330854 100644
--- a/common/main/newmenu.h
+++ b/common/main/newmenu.h
@@ -292,11 +292,12 @@ static inline newmenu_item nm_item_input(T &&... t)
 	return nm_set_item_input(i, std::forward<T>(t)...), i;
 }
 
-static inline void nm_set_item_checkbox(newmenu_item *ni, const char *text, unsigned checked)
+__attribute_nonnull()
+static inline void nm_set_item_checkbox(newmenu_item &ni, const char *text, unsigned checked)
 {
-	ni->type = NM_TYPE_CHECK;
-	ni->text = (char *)text;
-	ni->value = checked;
+	ni.type = NM_TYPE_CHECK;
+	ni.text = (char *)text;
+	ni.value = checked;
 }
 
 static inline void nm_set_item_text(newmenu_item *ni, const char *text)
@@ -380,7 +381,7 @@ static inline void nm_set_item_slider(newmenu_item *ni, const char *text, unsign
 #define DXX_COUNT_TEXT(S,OPT)	+1
 #define DXX_COUNT_INPUT(S,OPT,MAX_TEXT_LEN)	+1
 #define DXX_ADD_CHECK(S,OPT,V)	\
-	nm_set_item_checkbox(&((DXX_NEWMENU_VARIABLE)[(OPT)]), (S), (V));
+	nm_set_item_checkbox(((DXX_NEWMENU_VARIABLE)[(OPT)]), (S), (V));
 #define DXX_ADD_SLIDER(S,OPT,V,MIN,MAX)	\
 	nm_set_item_slider(&((DXX_NEWMENU_VARIABLE)[(OPT)]), (S), (V), (MIN), (MAX));
 #define DXX_ADD_SCALE_SLIDER(S,OPT,V,MIN,MAX,SCALE)	\
diff --git a/similar/main/gamecntl.cpp b/similar/main/gamecntl.cpp
index 1ea54abaf..09bba73ae 100644
--- a/similar/main/gamecntl.cpp
+++ b/similar/main/gamecntl.cpp
@@ -1703,9 +1703,9 @@ static void do_cheat_menu()
 
 	sprintf( score_text, "%d", Players[Player_num].score );
 
-	nm_set_item_checkbox(&mm[0],TXT_INVULNERABILITY,Players[Player_num].flags & PLAYER_FLAGS_INVULNERABLE);
-	nm_set_item_checkbox(&mm[1],TXT_CLOAKED,Players[Player_num].flags & PLAYER_FLAGS_CLOAKED);
-	nm_set_item_checkbox(&mm[2],"All keys",0);
+	nm_set_item_checkbox(mm[0],TXT_INVULNERABILITY,Players[Player_num].flags & PLAYER_FLAGS_INVULNERABLE);
+	nm_set_item_checkbox(mm[1],TXT_CLOAKED,Players[Player_num].flags & PLAYER_FLAGS_CLOAKED);
+	nm_set_item_checkbox(mm[2],"All keys",0);
 	nm_set_item_number(&mm[3], "% Energy", f2i(Players[Player_num].energy), 0, 200);
 	nm_set_item_number(&mm[4], "% Shields", f2i(Players[Player_num].shields), 0, 200);
 	nm_set_item_text(& mm[5], "Score:");
diff --git a/similar/main/menu.cpp b/similar/main/menu.cpp
index 13f7240f1..d2ec25fb5 100644
--- a/similar/main/menu.cpp
+++ b/similar/main/menu.cpp
@@ -942,7 +942,8 @@ void change_res()
 	nm_set_item_text(& m[mc], ""); mc++; // little space for overview
 	// fullscreen
 	opt_fullscr = mc;
-	nm_set_item_checkbox(&m[mc], "Fullscreen", gr_check_fullscreen()); mc++;
+	nm_set_item_checkbox(m[mc], "Fullscreen", gr_check_fullscreen());
+	mc++;
 
 	// create the menu
 	newmenu_do1(NULL, "Screen Resolution", mc, m, unused_newmenu_subfunction, unused_newmenu_userdata, 0);
@@ -1119,9 +1120,11 @@ void input_config()
 	int nitems = 0;
 
 	opt_ic_usejoy = nitems;
-	nm_set_item_checkbox(&m[nitems], "USE JOYSTICK", (PlayerCfg.ControlType&CONTROL_USING_JOYSTICK)); nitems++;
+	nm_set_item_checkbox(m[nitems], "USE JOYSTICK", (PlayerCfg.ControlType&CONTROL_USING_JOYSTICK));
+	nitems++;
 	opt_ic_usemouse = nitems;
-	nm_set_item_checkbox(&m[nitems], "USE MOUSE", (PlayerCfg.ControlType&CONTROL_USING_MOUSE)); nitems++;
+	nm_set_item_checkbox(m[nitems], "USE MOUSE", (PlayerCfg.ControlType&CONTROL_USING_MOUSE));
+	nitems++;
 	nm_set_item_text(& m[nitems], ""); nitems++;
 	opt_ic_confkey = nitems;
 	nm_set_item_menu(m[nitems], "CUSTOMIZE KEYBOARD"); nitems++;
@@ -1141,9 +1144,11 @@ void input_config()
 	nm_set_item_menu(m[nitems], "SENSITIVITY & DEADZONE"); nitems++;
 	nm_set_item_text(& m[nitems], ""); nitems++;
 	opt_ic_grabinput = nitems;
-	nm_set_item_checkbox(&m[nitems], "Keep Keyboard/Mouse focus", GameCfg.Grabinput); nitems++;
+	nm_set_item_checkbox(m[nitems], "Keep Keyboard/Mouse focus", GameCfg.Grabinput);
+	nitems++;
 	opt_ic_mousefsgauge = nitems;
-	nm_set_item_checkbox(&m[nitems], "Mouse FlightSim Indicator", PlayerCfg.MouseFSIndicator); nitems++;
+	nm_set_item_checkbox(m[nitems], "Mouse FlightSim Indicator", PlayerCfg.MouseFSIndicator);
+	nitems++;
 	nm_set_item_text(& m[nitems], ""); nitems++;
 	opt_ic_help0 = nitems;
 	nm_set_item_menu(m[nitems], "GAME SYSTEM KEYS"); nitems++;
@@ -1272,7 +1277,7 @@ void graphics_config()
 	nm_set_item_radio(&m[nitems++], "Anisotropic", 0, 0);
 #if defined(DXX_BUILD_DESCENT_II)
 	opt_gr_movietexfilt = nitems;
-	nm_set_item_checkbox(&m[nitems++], "Movie Filter", GameCfg.MovieTexFilt);
+	nm_set_item_checkbox(m[nitems++], "Movie Filter", GameCfg.MovieTexFilt);
 #endif
 	nm_set_item_text(& m[nitems], ""); nitems++;
 #endif
@@ -1282,16 +1287,16 @@ void graphics_config()
 	nm_set_item_menu(m[nitems], "Reticle Options"); nitems++;
 #ifdef OGL
 	opt_gr_alphafx = nitems;
-	nm_set_item_checkbox(&m[nitems], "Transparency Effects", PlayerCfg.AlphaEffects); nitems++;
+	nm_set_item_checkbox(m[nitems], "Transparency Effects", PlayerCfg.AlphaEffects); nitems++;
 	opt_gr_dynlightcolor = nitems;
-	nm_set_item_checkbox(&m[nitems], "Colored Dynamic Light", PlayerCfg.DynLightColor); nitems++;
+	nm_set_item_checkbox(m[nitems], "Colored Dynamic Light", PlayerCfg.DynLightColor); nitems++;
 	opt_gr_vsync = nitems;
-	nm_set_item_checkbox(&m[nitems],"VSync", GameCfg.VSync); nitems++;
+	nm_set_item_checkbox(m[nitems],"VSync", GameCfg.VSync); nitems++;
 	opt_gr_multisample = nitems;
-	nm_set_item_checkbox(&m[nitems],"4x multisampling", GameCfg.Multisample); nitems++;
+	nm_set_item_checkbox(m[nitems],"4x multisampling", GameCfg.Multisample); nitems++;
 #endif
 	opt_gr_fpsindi = nitems;
-	nm_set_item_checkbox(&m[nitems],"FPS Counter", GameCfg.FPSIndicator); nitems++;
+	nm_set_item_checkbox(m[nitems],"FPS Counter", GameCfg.FPSIndicator); nitems++;
 #ifdef OGL
 	m[opt_gr_texfilt+GameCfg.TexFilt].value=1;
 #endif
@@ -1753,7 +1758,7 @@ void do_sound_menu()
 	nm_set_item_slider(&m[nitems++], "music volume", GameCfg.MusicVolume, 0, 8);
 
 	opt_sm_revstereo = nitems;
-	nm_set_item_checkbox(&m[nitems++], TXT_REVERSE_STEREO, GameCfg.ReverseStereo);
+	nm_set_item_checkbox(m[nitems++], TXT_REVERSE_STEREO, GameCfg.ReverseStereo);
 
 	nm_set_item_text(& m[nitems++], "");
 
@@ -1789,7 +1794,7 @@ void do_sound_menu()
 #elif defined(DXX_BUILD_DESCENT_II)
 #define REDBOOK_PLAYORDER_TEXT	"force descent ][ cd track order"
 #endif
-	nm_set_item_checkbox(&m[nitems++], REDBOOK_PLAYORDER_TEXT, GameCfg.OrigTrackOrder);
+	nm_set_item_checkbox(m[nitems++], REDBOOK_PLAYORDER_TEXT, GameCfg.OrigTrackOrder);
 
 #ifdef USE_SDLMIXER
 	nm_set_item_text(& m[nitems++], "");
diff --git a/similar/main/net_udp.cpp b/similar/main/net_udp.cpp
index c0ad20f71..caf59c30b 100644
--- a/similar/main/net_udp.cpp
+++ b/similar/main/net_udp.cpp
@@ -3002,7 +3002,7 @@ static void net_udp_set_power (void)
 	newmenu_item m[MULTI_ALLOW_POWERUP_MAX];
 	for (int i = 0; i < MULTI_ALLOW_POWERUP_MAX; i++)
 	{
-		nm_set_item_checkbox(&m[i], multi_allow_powerup_text[i], (Netgame.AllowedItems >> i) & 1);
+		nm_set_item_checkbox(m[i], multi_allow_powerup_text[i], (Netgame.AllowedItems >> i) & 1);
 	}
 
 	newmenu_do1( NULL, "Objects to allow", MULTI_ALLOW_POWERUP_MAX, m, unused_newmenu_subfunction, unused_newmenu_userdata, 0 );
@@ -3679,7 +3679,7 @@ static net_udp_select_players(void)
 		
 	for (int i=0; i< MAX_PLAYERS+4; i++ ) {
 		sprintf( text[i], "%d.  %-20s", i+1, "" );
-		nm_set_item_checkbox(&m[i], text[i], 0);
+		nm_set_item_checkbox(m[i], text[i], 0);
 	}
 
 	m[0].value = 1;                         // Assume server will play...