From 97ca82fb1912edcafa201b8983783c47fb849dc3 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sun, 21 Dec 2014 13:30:23 -0800 Subject: [PATCH] get rid of redbook ifdefs --- main/gamecntl.c | 2 -- main/inferno.c | 2 -- main/menu.c | 40 ++++++++-------------------------------- main/newmenu.c | 2 -- main/songs.c | 2 -- 5 files changed, 8 insertions(+), 40 deletions(-) diff --git a/main/gamecntl.c b/main/gamecntl.c index ff719d0e..ea69152d 100644 --- a/main/gamecntl.c +++ b/main/gamecntl.c @@ -1241,7 +1241,6 @@ int HandleSystemKey(int key) #ifdef MACINTOSH case KEY_COMMAND+KEY_M: - #if !defined(SHAREWARE) || defined(APPLE_DEMO) if ( (Game_mode & GM_MULTI) ) // don't process in multiplayer games break; @@ -1256,7 +1255,6 @@ int HandleSystemKey(int key) clear_boxed_message(); key_init(); start_time(); - #endif break; diff --git a/main/inferno.c b/main/inferno.c index dd8cda3f..d5b02493 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -288,9 +288,7 @@ void print_commandline_help() printf( " -nomovies %s\n","Don't play movies"); printf( " -noscreens %s\n","Skip briefing screens"); #endif -#if !defined(SHAREWARE) || ( defined(SHAREWARE) && defined(APPLE_DEMO) ) printf( " -noredbook %s\n","Disable redbook audio"); -#endif printf( " -norun %s\n","Bail out after initialization"); // printf( " -ordinaljoy %s\n","FIXME: Undocumented"); // printf( " -rtscts %s\n","Same as -ctsrts"); diff --git a/main/menu.c b/main/menu.c index 69114c6e..14432ebd 100644 --- a/main/menu.c +++ b/main/menu.c @@ -1228,9 +1228,6 @@ void sound_menuset(int nitems, newmenu_item * items, int *last_key, int citem ) } #endif - // don't enable redbook for a non-apple demo version of the shareware demo - #if !defined(SHAREWARE) || ( defined(SHAREWARE) && defined(APPLE_DEMO) ) - if (Config_redbook_volume != items[2].value ) { Config_redbook_volume = items[2].value; set_redbook_volume(Config_redbook_volume); @@ -1274,8 +1271,6 @@ void sound_menuset(int nitems, newmenu_item * items, int *last_key, int citem ) } } - #endif - citem++; //kill warning } @@ -1302,33 +1297,14 @@ void do_sound_menu() } #endif - #ifdef SHAREWARE - m[ 2].type = NM_TYPE_TEXT; m[ 2].text=""; - m[ 3].type = NM_TYPE_TEXT; m[ 3].text=""; - m[ 4].type = NM_TYPE_TEXT; m[ 4].text=""; - #ifdef MACINTOSH - m[ 3].type = NM_TYPE_SLIDER; m[ 3].text="Sound Manager Volume"; m[3].value=Config_master_volume;m[3].min_value=0; m[3].max_value=8; - - #ifdef APPLE_DEMO - m[ 2].type = (Redbook_playing?NM_TYPE_SLIDER:NM_TYPE_TEXT); m[ 2].text="CD music volume"; m[2].value=Config_redbook_volume;m[2].min_value=0; m[2].max_value=8; - m[ 4].type = NM_TYPE_CHECK; m[ 4].text="CD Music (Redbook) enabled"; m[4].value=(Redbook_playing!=0); - #endif - - #endif - - #else // ifdef SHAREWARE - m[ 2].type = (Redbook_playing?NM_TYPE_SLIDER:NM_TYPE_TEXT); m[ 2].text="CD music volume"; m[2].value=Config_redbook_volume;m[2].min_value=0; m[2].max_value=8; - - #ifndef MACINTOSH - m[ 3].type = NM_TYPE_TEXT; m[ 3].text=""; - #else - m[ 3].type = NM_TYPE_SLIDER; m[ 3].text="Sound Manager Volume"; m[3].value=Config_master_volume;m[3].min_value=0; m[3].max_value=8; - #endif - - m[ 4].type = NM_TYPE_CHECK; m[ 4].text="CD Music (Redbook) enabled"; m[4].value=(Redbook_playing!=0); - #endif - - m[ 5].type = NM_TYPE_CHECK; m[ 5].text=TXT_REVERSE_STEREO; m[5].value=Config_channels_reversed; + m[ 2].type = (Redbook_playing?NM_TYPE_SLIDER:NM_TYPE_TEXT); m[ 2].text="CD music volume"; m[2].value=Config_redbook_volume;m[2].min_value=0; m[2].max_value=8; +#ifndef MACINTOSH + m[ 3].type = NM_TYPE_TEXT; m[ 3].text=""; +#else + m[ 3].type = NM_TYPE_SLIDER; m[ 3].text="Sound Manager Volume"; m[3].value=Config_master_volume;m[3].min_value=0; m[3].max_value=8; +#endif + m[ 4].type = NM_TYPE_CHECK; m[ 4].text="CD Music (Redbook) enabled"; m[4].value=(Redbook_playing!=0); + m[ 5].type = NM_TYPE_CHECK; m[ 5].text=TXT_REVERSE_STEREO; m[5].value=Config_channels_reversed; i = newmenu_do1( NULL, "Sound Effects & Music", sizeof(m)/sizeof(*m), m, sound_menuset, i ); diff --git a/main/newmenu.c b/main/newmenu.c index 7c05fcb8..019978bf 100644 --- a/main/newmenu.c +++ b/main/newmenu.c @@ -1371,7 +1371,6 @@ int newmenu_do4( char * title, char * subtitle, int nitems, newmenu_item * item, case KEY_COMMAND+KEY_M: k = -1; - #if !defined(SHAREWARE) || defined(APPLE_DEMO) if ( (Game_mode & GM_MULTI) ) // don't process in multiplayer games break; @@ -1389,7 +1388,6 @@ int newmenu_do4( char * title, char * subtitle, int nitems, newmenu_item * item, key_init(); key_flush(); start_time(); - #endif break; diff --git a/main/songs.c b/main/songs.c index 426b1fdb..6af38ce8 100644 --- a/main/songs.c +++ b/main/songs.c @@ -122,7 +122,6 @@ void songs_init() Songs_initialized = 1; // RBA Hook - #if !defined(SHAREWARE) || ( defined(SHAREWARE) && defined(APPLE_DEMO) ) if (FindArg("-noredbook")) { Redbook_enabled = 0; @@ -142,7 +141,6 @@ void songs_init() } } atexit(RBAStop); // stop song on exit - #endif // endof ifndef SHAREWARE, ie ifdef SHAREWARE } #define FADE_TIME (f1_0/2) -- 2.39.2