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

Restructure menu.c for merging

Browse source
This commit is contained in:
Kp 2013-08-17 15:28:20 +00:00
parent 31b9ad0bde
commit 051e346186
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
d1x-rebirth/main/menu.c
View file

@ -434,7 +434,8 @@ int main_menu_handler(newmenu *menu, d_event *event, int *menu_choice )
break;
case EVENT_IDLE:
if ( keyd_time_when_last_pressed+i2f(45) < timer_query() || GameArg.SysAutoDemo )
#define DXX_DEMO_KEY_DELAY 45
if ( keyd_time_when_last_pressed+i2f(DXX_DEMO_KEY_DELAY) < timer_query() || GameArg.SysAutoDemo )
{
keyd_time_when_last_pressed = timer_query(); // Reset timer so that disk won't thrash if no demos.
newdemo_start_playback(NULL); // Randomly pick a file
@ -1784,7 +1785,8 @@ void do_sound_menu()
#endif
opt_sm_redbook_playorder = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text = "force mac cd track order"; m[nitems++].value = GameCfg.OrigTrackOrder;
#define REDBOOK_PLAYORDER_TEXT "force mac cd track order"
m[nitems].type = NM_TYPE_CHECK; m[nitems].text = REDBOOK_PLAYORDER_TEXT; m[nitems++].value = GameCfg.OrigTrackOrder;
#ifdef USE_SDLMIXER
m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "";

9
d2x-rebirth/main/menu.c
View file

@ -439,7 +439,8 @@ int main_menu_handler(newmenu *menu, d_event *event, int *menu_choice )
break;
case EVENT_IDLE:
if ( keyd_time_when_last_pressed+i2f(25) < timer_query() || GameArg.SysAutoDemo )
#define DXX_DEMO_KEY_DELAY 25
if ( keyd_time_when_last_pressed+i2f(DXX_DEMO_KEY_DELAY) < timer_query() || GameArg.SysAutoDemo )
{
int n_demos;
n_demos = newdemo_count_demos();
@ -1202,7 +1203,8 @@ void reticle_config()
PlayerCfg.ReticleSize = m[opt_ret_size].value;
}
int opt_gr_texfilt, opt_gr_movietexfilt, opt_gr_brightness, opt_gr_reticlemenu, opt_gr_alphafx, opt_gr_dynlightcolor, opt_gr_vsync, opt_gr_multisample, opt_gr_fpsindi;
int opt_gr_texfilt, opt_gr_brightness, opt_gr_reticlemenu, opt_gr_alphafx, opt_gr_dynlightcolor, opt_gr_vsync, opt_gr_multisample, opt_gr_fpsindi;
int opt_gr_movietexfilt;
int graphics_config_menuset(newmenu *menu, d_event *event, void *userdata)
{
newmenu_item *items = newmenu_get_items(menu);
@ -1808,7 +1810,8 @@ void do_sound_menu()
#endif
opt_sm_redbook_playorder = nitems;
m[nitems].type = NM_TYPE_CHECK; m[nitems].text = "force descent ][ cd track order"; m[nitems++].value = GameCfg.OrigTrackOrder;
#define REDBOOK_PLAYORDER_TEXT "force descent ][ cd track order"
m[nitems].type = NM_TYPE_CHECK; m[nitems].text = REDBOOK_PLAYORDER_TEXT; m[nitems++].value = GameCfg.OrigTrackOrder;
#ifdef USE_SDLMIXER
m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "";