From 54ab069bb8d92ee5b4d446b6c03956d96fc47e85 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 18 Jan 2015 01:58:32 +0000 Subject: [PATCH] Pass nm_set_item_number arg by & --- common/main/newmenu.h | 13 +++++++------ similar/main/gamecntl.cpp | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/common/main/newmenu.h b/common/main/newmenu.h index 10d273d31..f2df5fcab 100644 --- a/common/main/newmenu.h +++ b/common/main/newmenu.h @@ -324,13 +324,14 @@ static inline void nm_set_item_radio(newmenu_item &ni, const char *text, unsigne ni.group = grp; } -static inline void nm_set_item_number(newmenu_item *ni, const char *text, unsigned now, unsigned low, unsigned high) +__attribute_nonnull() +static inline void nm_set_item_number(newmenu_item &ni, const char *text, unsigned now, unsigned low, unsigned high) { - ni->type = NM_TYPE_NUMBER; - ni->text = (char *)text; - ni->value = now; - ni->min_value = low; - ni->max_value = high; + ni.type = NM_TYPE_NUMBER; + ni.text = (char *)text; + ni.value = now; + ni.min_value = low; + ni.max_value = high; } static inline void nm_set_item_slider(newmenu_item *ni, const char *text, unsigned now, unsigned low, unsigned high) diff --git a/similar/main/gamecntl.cpp b/similar/main/gamecntl.cpp index 964dbde73..e43736b0a 100644 --- a/similar/main/gamecntl.cpp +++ b/similar/main/gamecntl.cpp @@ -1708,8 +1708,8 @@ static void do_cheat_menu() 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_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:"); nm_set_item_input(mm[6], score_text); #if defined(DXX_BUILD_DESCENT_I) @@ -1717,12 +1717,12 @@ static void do_cheat_menu() nm_set_item_radio(mm[8], "Laser level 2", (Players[Player_num].laser_level==1), 0); nm_set_item_radio(mm[9], "Laser level 3", (Players[Player_num].laser_level==2), 0); nm_set_item_radio(mm[10], "Laser level 4", (Players[Player_num].laser_level==3), 0); - nm_set_item_number(&mm[11], "Missiles", Players[Player_num].secondary_ammo[CONCUSSION_INDEX], 0, 200); + nm_set_item_number(mm[11], "Missiles", Players[Player_num].secondary_ammo[CONCUSSION_INDEX], 0, 200); mmn = newmenu_do("Wimp Menu",NULL,12, mm, unused_newmenu_subfunction, unused_newmenu_userdata); #elif defined(DXX_BUILD_DESCENT_II) - nm_set_item_number(&mm[7], "Laser Level", Players[Player_num].laser_level+1, 0, MAX_SUPER_LASER_LEVEL+1); - nm_set_item_number(&mm[8], "Missiles", Players[Player_num].secondary_ammo[CONCUSSION_INDEX], 0, 200); + nm_set_item_number(mm[7], "Laser Level", Players[Player_num].laser_level+1, 0, MAX_SUPER_LASER_LEVEL+1); + nm_set_item_number(mm[8], "Missiles", Players[Player_num].secondary_ammo[CONCUSSION_INDEX], 0, 200); mmn = newmenu_do("Wimp Menu",NULL,9, mm, unused_newmenu_subfunction, unused_newmenu_userdata); #endif