diff --git a/d1x.ini b/d1x.ini index a3557a945..b9d6e3161 100755 --- a/d1x.ini +++ b/d1x.ini @@ -24,6 +24,7 @@ ************** ***Settings*** ************** +;-nod1xmenu ;Disables D1X options menu for a more nostalgic experience; ;-demo ;Start playing demo ;-notitles ;Do not show titlescreens on startup ;-missiondir ;Set alternate mission dir to diff --git a/main/inferno.c b/main/inferno.c index c0ae3df74..c5e666ccb 100755 --- a/main/inferno.c +++ b/main/inferno.c @@ -261,6 +261,7 @@ void show_cmdline_help() { getch(); printf( "\n"); printf( " D1X-Rebirth options:\n"); + printf( " -nod1xmenu %s\n", "Disables D1X options menu for a more nostalgic experience"); printf( " -mprofile %s\n", "Use multi game profile "); printf( " -missiondir %s\n", "Set alternate mission dir to "); printf( " -mission %s\n", "Use mission to start game"); diff --git a/main/menu.c b/main/menu.c index e00f42372..de12da83c 100755 --- a/main/menu.c +++ b/main/menu.c @@ -1184,8 +1184,7 @@ void joydef_menuset(int nitems, newmenu_item * items, int *last_key, int citem ) void do_options_menu() { -// newmenu_item m[14]; - newmenu_item m[14]; + newmenu_item m[14]; int i = 0; @@ -1195,38 +1194,41 @@ void do_options_menu() m[2].type = NM_TYPE_CHECK; m[2].text=TXT_REVERSE_STEREO; m[2].value=Config_channels_reversed; m[3].type = NM_TYPE_TEXT; m[3].text=""; //added/changed on 10/27/98 by Victor Rachels to increase brightness range - m[4].type = NM_TYPE_SLIDER; m[4].text=TXT_BRIGHTNESS; m[4].value=gr_palette_get_gamma();m[4].min_value=0; m[4].max_value=16; + m[4].type = NM_TYPE_SLIDER; m[4].text=TXT_BRIGHTNESS; m[4].value=gr_palette_get_gamma();m[4].min_value=0; m[4].max_value=16; //end this section addition - Victor Rachels m[5].type = NM_TYPE_TEXT; m[5].text=""; m[6].type = NM_TYPE_MENU; m[6].text=TXT_CONTROLS_; m[7].type = NM_TYPE_MENU; m[7].text=TXT_DETAIL_LEVELS; m[8].type = NM_TYPE_MENU; m[8].text=TXT_CAL_JOYSTICK; //added/changed on 10/27/98 by Victor Rachels to increase sensitivity range - m[9].type = NM_TYPE_SLIDER; m[9].text=TXT_JOYS_SENSITIVITY; m[9].value=Config_joystick_sensitivity; m[9].min_value =0; m[9].max_value = 16; + m[9].type = NM_TYPE_SLIDER; m[9].text=TXT_JOYS_SENSITIVITY; m[9].value=Config_joystick_sensitivity; m[9].min_value =0; m[9].max_value = 16; //end this section addition - Victor Rachels //added on 4/13/99 by Victor Rachels to add joystick deadzone option - m[10].type = NM_TYPE_SLIDER; m[10].text="Joystick Deadzone"; m[10].value=joy_deadzone; m[10].min_value=0; m[10].max_value=16; + m[10].type = NM_TYPE_SLIDER; m[10].text="Joystick Deadzone"; m[10].value=joy_deadzone; m[10].min_value=0; m[10].max_value=16; //end this section addition - VR - m[11].type = NM_TYPE_TEXT; m[11].text=""; - m[12].type = NM_TYPE_CHECK; m[12].text="Ship auto-leveling"; m[12].value=Auto_leveling_on; - m[13].type = NM_TYPE_MENU; m[13].text="D1X options..."; - - i = newmenu_do1( NULL, TXT_OPTIONS, 14, m, joydef_menuset, i ); + m[11].type = NM_TYPE_TEXT; m[11].text=""; + m[12].type = NM_TYPE_CHECK; m[12].text="Ship auto-leveling"; m[12].value=Auto_leveling_on; + m[13].type = NM_TYPE_MENU; m[13].text="D1X options..."; + + if (FindArg("-nod1xmenu")) + i = newmenu_do1( NULL, TXT_OPTIONS, 13, m, joydef_menuset, i ); + else + i = newmenu_do1( NULL, TXT_OPTIONS, 14, m, joydef_menuset, i ); switch(i) { - case 6: joydefs_config(); break; - case 7: do_detail_level_menu(); break; - case 8: joydefs_calibrate(); break; - case 13: d1x_options_menu(); break; + case 6: joydefs_config(); break; + case 7: do_detail_level_menu(); break; + case 8: joydefs_calibrate(); break; + case 13: d1x_options_menu(); break; } Config_channels_reversed = m[2].value; Config_joystick_sensitivity = m[9].value; - joy_deadzone = m[10].value; - Auto_leveling_on = m[12].value; + joy_deadzone = m[10].value; + Auto_leveling_on = m[12].value; } while( i>-1 ); - write_player_file(); + write_player_file(); } #ifdef NETWORK void do_multi_player_menu()