From 6f5d6fd2e2bd24021b4bf12fb5a7101da9e273c1 Mon Sep 17 00:00:00 2001 From: zicodxx <> Date: Sun, 18 May 2008 13:20:06 +0000 Subject: [PATCH] Reworked keys for song changing a bit; Added Song control keys to help menu --- CHANGELOG.txt | 1 + main/game.c | 4 ++ main/gamecntl.c | 98 ++++++++----------------------------------------- main/songs.c | 11 +----- 4 files changed, 21 insertions(+), 93 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3cbce0e04..fb222492e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ D2X-Rebirth Changelog 20080518 -------- include/physfsx.h, main/config.c: set "Jukebox" as the default jukebox path, for Mac OS 9 look for d2x.ini outside the app bundle +main/game.c, main/gamecntl.c, main/songs.c: Reworked keys for song changing a bit; Added Song control keys to help menu 20080516 -------- diff --git a/main/game.c b/main/game.c index 4217f77d0..ac688f960 100644 --- a/main/game.c +++ b/main/game.c @@ -1084,6 +1084,10 @@ void show_help() m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "Alt-Shift-F4\t Rename GuideBot"; m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "Shift-F5/F6\t Drop primary/secondary"; m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "Shift-number\t GuideBot commands"; +#ifdef USE_SDLMIXER + m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "Shift-F9/F10\t Play/Pause Jukebox"; + m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "Shift-F11/F12\t Previous/Next Song"; +#endif m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = ""; m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "MULTIPLAYER:"; m[nitems].type = NM_TYPE_TEXT; m[nitems++].text = "ALT-0\t DROP FLAG"; diff --git a/main/gamecntl.c b/main/gamecntl.c index e9627fc4d..23d7fd7ab 100644 --- a/main/gamecntl.c +++ b/main/gamecntl.c @@ -1120,55 +1120,6 @@ int HandleSystemKey(int key) change_guidebot_name(); break; - case KEY_MINUS + KEY_ALTED: songs_goto_prev_song(); break; - case KEY_EQUAL + KEY_ALTED: songs_goto_next_song(); break; - - #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; - - key_close(); // no processing of keys with keyboard handler.. jeez - stop_time(); - show_boxed_message ("Mounting CD\nESC to quit", 0); - RBAMountDisk(); // OS has totaly control of the CD. - if (Function_mode == FMODE_MENU) - songs_play_song(SONG_TITLE,1); - else if (Function_mode == FMODE_GAME) - songs_play_level_song( Current_level_num ); - key_init(); - start_time(); - #endif - - break; - - case KEY_COMMAND+KEY_E: - songs_stop_redbook(); - RBAEjectDisk(); - break; - - case KEY_COMMAND+KEY_RIGHT: - songs_goto_next_song(); - break; - case KEY_COMMAND+KEY_LEFT: - songs_goto_prev_song(); - break; - case KEY_COMMAND+KEY_UP: - songs_play_level_song(1); - break; - case KEY_COMMAND+KEY_DOWN: - songs_stop_redbook(); - break; - - case KEY_COMMAND+KEY_Q: - if ( !(Game_mode & GM_MULTI) ) - macintosh_quit(); - break; - #endif - - #ifdef USE_SDLMIXER /* * Jukebox hotkeys -- MD2211, 2007 @@ -1181,49 +1132,30 @@ int HandleSystemKey(int key) jukebox_stop(); break; case KEY_ALTED + KEY_SHIFTED + KEY_F11: - jukebox_prev(); + if (GameCfg.JukeboxOn) + jukebox_prev(); + else + songs_goto_prev_song(); break; case KEY_ALTED + KEY_SHIFTED + KEY_F12: - jukebox_next(); + if (GameCfg.JukeboxOn) + jukebox_next(); + else + songs_goto_next_song(); + break; +#else + case KEY_ALTED + KEY_SHIFTED + KEY_F11: + songs_goto_prev_song(); + break; + case KEY_ALTED + KEY_SHIFTED + KEY_F12: + songs_goto_next_song(); break; #endif - -//added 8/23/99 by Matt Mueller for hot key res/fullscreen changing, and menu access -#if 0 - case KEY_CTRLED+KEY_SHIFTED+KEY_PADMULTIPLY: - case KEY_ALTED+KEY_CTRLED+KEY_PADMULTIPLY: - case KEY_ALTED+KEY_SHIFTED+KEY_PADMULTIPLY: - change_res(); - break; - case KEY_CTRLED+KEY_SHIFTED+KEY_PADMINUS: - case KEY_ALTED+KEY_CTRLED+KEY_PADMINUS: - case KEY_ALTED+KEY_SHIFTED+KEY_PADMINUS: - //lower res - //should we just cycle through the list that is displayed in the res change menu? - // what if their card/X/etc can't handle that mode? hrm. - //well, the quick access to the menu is good enough for now. - break; - case KEY_CTRLED+KEY_SHIFTED+KEY_PADPLUS: - case KEY_ALTED+KEY_CTRLED+KEY_PADPLUS: - case KEY_ALTED+KEY_SHIFTED+KEY_PADPLUS: - //increase res - break; -#endif case KEY_ALTED+KEY_ENTER: case KEY_ALTED+KEY_PADENTER: gr_toggle_fullscreen(); break; -//end addition -MM - -//added 11/01/98 Matt Mueller -#if 0 - case KEY_CTRLED+KEY_ALTED+KEY_LAPOSTRO: - toggle_hud_log(); - break; -#endif -//end addition -MM - default: break; diff --git a/main/songs.c b/main/songs.c index 21848c3c8..3f1cf836a 100644 --- a/main/songs.c +++ b/main/songs.c @@ -340,22 +340,13 @@ void songs_play_level_song( int levelnum ) } if (GameArg.SndEnableRedbook && RBAEnabled() && (n_tracks = RBAGetNumberOfTracks()) > 1) { - //try to play redbook - play_redbook_track(REDBOOK_FIRST_LEVEL_TRACK + (songnum % (n_tracks-REDBOOK_FIRST_LEVEL_TRACK+1)),1); } if (! Redbook_playing) { //not playing redbook, so play midi - songnum = SONG_FIRST_LEVEL_SONG + (songnum % NumLevelSongs); - - #ifndef MACINTOSH - digi_play_midi_song( Songs[songnum].filename, Songs[songnum].melodic_bank_file, Songs[songnum].drum_bank_file, 1 ); - #else - digi_play_midi_song( songnum, 1 ); - #endif - + digi_play_midi_song( Songs[songnum].filename, Songs[songnum].melodic_bank_file, Songs[songnum].drum_bank_file, 1 ); } }