TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass nm_set_item_number arg by &

Browse source
This commit is contained in:
Kp 2015-01-18 01:58:32 +00:00
parent 426fb16654
commit 54ab069bb8
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
common/main/newmenu.h
View file

@ -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)

10
similar/main/gamecntl.cpp
View file

@ -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