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

Use helper for setting menu items to type checkbox

Browse source
This commit is contained in:
Kp 2012-11-24 20:57:15 +00:00
parent bb8b229dc2
commit 4c5eaded8d
4 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/main/newmenu.h
View file

@ -166,6 +166,13 @@ static inline void nm_set_item_input(newmenu_item *ni, unsigned len, char *text)
ni->text_len = len;
}
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;
}
static inline void nm_set_item_text(newmenu_item *ni, const char *text)
{
ni->type = NM_TYPE_TEXT;
@ -221,9 +228,7 @@ static inline void nm_set_item_text(newmenu_item *ni, const char *text)
#define DXX_COUNT_TEXT(S,OPT) +1
#define DXX_COUNT_INPUT(S,OPT,MAX_TEXT_LEN) +1
#define DXX_ADD_CHECK(S,OPT,V) \
(DXX_NEWMENU_VARIABLE)[(OPT)].type=NM_TYPE_CHECK; \
(DXX_NEWMENU_VARIABLE)[(OPT)].text=(S); \
(DXX_NEWMENU_VARIABLE)[(OPT)].value=V;
nm_set_item_checkbox(&((DXX_NEWMENU_VARIABLE)[(OPT)]), (S), (V));
#define DXX_ADD_SLIDER(S,OPT,V,MIN,MAX) \
(DXX_NEWMENU_VARIABLE)[(OPT)].type=NM_TYPE_SLIDER; \
(DXX_NEWMENU_VARIABLE)[(OPT)].value=V; \

6
similar/main/gamecntl.c
View file

@ -1758,9 +1758,9 @@ void do_cheat_menu()
sprintf( score_text, "%d", Players[Player_num].score );
mm[0].type=NM_TYPE_CHECK; mm[0].value=Players[Player_num].flags & PLAYER_FLAGS_INVULNERABLE; mm[0].text="Invulnerability";
mm[1].type=NM_TYPE_CHECK; mm[1].value=Players[Player_num].flags & PLAYER_FLAGS_CLOAKED; mm[1].text="Cloaked";
mm[2].type=NM_TYPE_CHECK; mm[2].value=0; mm[2].text="All keys";
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);
mm[3].type=NM_TYPE_NUMBER; mm[3].value=f2i(Players[Player_num].energy); mm[3].text="% Energy"; mm[3].min_value=0; mm[3].max_value=200;
mm[4].type=NM_TYPE_NUMBER; mm[4].value=f2i(Players[Player_num].shields); mm[4].text="% Shields"; mm[4].min_value=0; mm[4].max_value=200;
nm_set_item_text(& mm[5], "Score:");

26
similar/main/menu.c
View file

@ -942,7 +942,7 @@ void change_res()
nm_set_item_text(& m[mc], ""); mc++; // little space for overview
// fullscreen
opt_fullscr = mc;
m[mc].type = NM_TYPE_CHECK; m[mc].text = "Fullscreen"; m[mc].value = 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, NULL, NULL, 0);
@ -1121,9 +1121,9 @@ void input_config()
int nitems = 0;
opt_ic_usejoy = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text = "USE JOYSTICK"; m[nitems].value = (PlayerCfg.ControlType&CONTROL_USING_JOYSTICK); nitems++;
nm_set_item_checkbox(&m[nitems], "USE JOYSTICK", (PlayerCfg.ControlType&CONTROL_USING_JOYSTICK)); nitems++;
opt_ic_usemouse = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text = "USE MOUSE"; m[nitems].value = (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++;
@ -1143,9 +1143,9 @@ void input_config()
nm_set_item_menu(&m[nitems], "SENSITIVITY & DEADZONE"); nitems++;
nm_set_item_text(& m[nitems], ""); nitems++;
opt_ic_grabinput = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text= "Keep Keyboard/Mouse focus"; m[nitems].value = GameCfg.Grabinput; nitems++;
nm_set_item_checkbox(&m[nitems], "Keep Keyboard/Mouse focus", GameCfg.Grabinput); nitems++;
opt_ic_mousefsgauge = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text= "Mouse FlightSim Indicator"; m[nitems].value = 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++;
@ -1276,7 +1276,7 @@ void graphics_config()
m[nitems].type = NM_TYPE_RADIO; m[nitems].text = "Anisotropic"; m[nitems].value = 0; m[nitems].group = 0; nitems++;
#if defined(DXX_BUILD_DESCENT_II)
opt_gr_movietexfilt = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text = "Movie Filter"; m[nitems].value = GameCfg.MovieTexFilt; nitems++;
nm_set_item_checkbox(&m[nitems++], "Movie Filter", GameCfg.MovieTexFilt);
#endif
nm_set_item_text(& m[nitems], ""); nitems++;
#endif
@ -1286,16 +1286,16 @@ void graphics_config()
nm_set_item_menu(&m[nitems], "Reticle Options"); nitems++;
#ifdef OGL
opt_gr_alphafx = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text = "Transparency Effects"; m[nitems].value = PlayerCfg.AlphaEffects; nitems++;
nm_set_item_checkbox(&m[nitems], "Transparency Effects", PlayerCfg.AlphaEffects); nitems++;
opt_gr_dynlightcolor = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text = "Colored Dynamic Light"; m[nitems].value = PlayerCfg.DynLightColor; nitems++;
nm_set_item_checkbox(&m[nitems], "Colored Dynamic Light", PlayerCfg.DynLightColor); nitems++;
opt_gr_vsync = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text="VSync"; m[nitems].value = GameCfg.VSync; nitems++;
nm_set_item_checkbox(&m[nitems],"VSync", GameCfg.VSync); nitems++;
opt_gr_multisample = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text="4x multisampling"; m[nitems].value = GameCfg.Multisample; nitems++;
nm_set_item_checkbox(&m[nitems],"4x multisampling", GameCfg.Multisample); nitems++;
#endif
opt_gr_fpsindi = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text="FPS Counter"; m[nitems].value = 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
@ -1804,7 +1804,7 @@ void do_sound_menu()
m[nitems].type = NM_TYPE_SLIDER; m[nitems].text = "music volume"; m[nitems].value = GameCfg.MusicVolume; m[nitems].min_value = 0; m[nitems++].max_value = 8;
opt_sm_revstereo = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text = TXT_REVERSE_STEREO; m[nitems++].value = GameCfg.ReverseStereo;
nm_set_item_checkbox(&m[nitems++], TXT_REVERSE_STEREO, GameCfg.ReverseStereo);
nm_set_item_text(& m[nitems++], "");
@ -1840,7 +1840,7 @@ void do_sound_menu()
#elif defined(DXX_BUILD_DESCENT_II)
#define REDBOOK_PLAYORDER_TEXT "force descent ][ cd track order"
#endif
m[nitems].type = NM_TYPE_CHECK; m[nitems].text = REDBOOK_PLAYORDER_TEXT; m[nitems++].value = GameCfg.OrigTrackOrder;
nm_set_item_checkbox(&m[nitems++], REDBOOK_PLAYORDER_TEXT, GameCfg.OrigTrackOrder);
#ifdef USE_SDLMIXER
nm_set_item_text(& m[nitems++], "");

4
similar/main/net_udp.c
View file

@ -2953,7 +2953,7 @@ void net_udp_set_power (void)
for (i = 0; i < MULTI_ALLOW_POWERUP_MAX; i++)
{
m[i].type = NM_TYPE_CHECK; m[i].text = (char *)multi_allow_powerup_text[i]; m[i].value = (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, NULL, NULL, 0 );
@ -3646,7 +3646,7 @@ net_udp_select_players(void)
for (i=0; i< MAX_PLAYERS+4; i++ ) {
sprintf( text[i], "%d. %-20s", i+1, "" );
m[i].type = NM_TYPE_CHECK; m[i].text = text[i]; m[i].value = 0;
nm_set_item_checkbox(&m[i], text[i], 0);
}
m[0].value = 1; // Assume server will play...