Subversion Repositories eduke32

Rev

Rev 8765 | Rev 8772 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 8765 Rev 8771
Line 3244... Line 3244...
3244
    osdcmd_cheatsinfo_stat.cheatnum = CHEAT_SKILL;
3244
    osdcmd_cheatsinfo_stat.cheatnum = CHEAT_SKILL;
3245
3245
3246
    return 0;
3246
    return 0;
3247
}
3247
}
3248
3248
-
 
3249
static void Menu_RefreshSoundProperties()
-
 
3250
{
-
 
3251
    ud.config.MixRate     = FX_MixRate;
-
 
3252
    ud.config.MusicDevice = MIDI_GetDevice();
-
 
3253
-
 
3254
    soundrate   = ud.config.MixRate;
-
 
3255
    soundvoices = ud.config.NumVoices;
-
 
3256
    musicdevice = ud.config.MusicDevice;
-
 
3257
    opl3stereo  = AL_Stereo;
-
 
3258
}
-
 
3259
3249
/*
3260
/*
3250
Functions where a "newValue" or similar is passed are run *before* the linked variable is actually changed.
3261
Functions where a "newValue" or similar is passed are run *before* the linked variable is actually changed.
3251
That way you can compare the new and old values and potentially block the change.
3262
That way you can compare the new and old values and potentially block the change.
3252
*/
3263
*/
3253
static void Menu_EntryLinkActivate(MenuEntry_t *entry)
3264
static void Menu_EntryLinkActivate(MenuEntry_t *entry)
Line 3420... Line 3431...
3420
                S_MusicStartup();
3431
                S_MusicStartup();
3421
            }
3432
            }
3422
3433
3423
            S_RestartMusic();
3434
            S_RestartMusic();
3424
        }
3435
        }
-
 
3436
-
 
3437
        Menu_RefreshSoundProperties();
3425
    }
3438
    }
3426
    else if (entry == &ME_SAVESETUP_CLEANUP)
3439
    else if (entry == &ME_SAVESETUP_CLEANUP)
3427
    {
3440
    {
3428
        g_oldSaveCnt = G_CountOldSaves();
3441
        g_oldSaveCnt = G_CountOldSaves();
3429
        Menu_Change(MENU_SAVECLEANVERIFY);
3442
        Menu_Change(MENU_SAVECLEANVERIFY);
Line 4455... Line 4468...
4455
#ifndef EDUKE32_RETAIL_MENU
4468
#ifndef EDUKE32_RETAIL_MENU
4456
    case MENU_SOUND:
4469
    case MENU_SOUND:
4457
    case MENU_SOUND_SF2:
4470
    case MENU_SOUND_SF2:
4458
        Bstrcpy(sf2bankfile, SF2_BankFile);
4471
        Bstrcpy(sf2bankfile, SF2_BankFile);
4459
        break;
4472
        break;
-
 
4473
#endif
4460
4474
4461
    case MENU_SOUND_DEVSETUP:
4475
    case MENU_SOUND_DEVSETUP:
-
 
4476
#ifndef EDUKE32_RETAIL_MENU
4462
        ME_SOUND_SF2.name = (!sf2bankfile[0]) ? "Select sound bank..." : sf2bankfile;
4477
        ME_SOUND_SF2.name = (!sf2bankfile[0]) ? "Select sound bank..." : sf2bankfile;
-
 
4478
        // enter in file selector = MENU_SOUND_SF2, esc in file selector = MENU_SOUND_DEVSETUP
4463
        if (m_previousMenu->menuID != MENU_SOUND_SF2)
4479
        if (m_previousMenu->menuID != MENU_SOUND_SF2 && m_previousMenu->menuID != MENU_SOUND_DEVSETUP)
4464
#endif
4480
#endif
4465
        {
-
 
4466
            soundrate   = ud.config.MixRate;
-
 
4467
            soundvoices = ud.config.NumVoices;
-
 
4468
            musicdevice = ud.config.MusicDevice;
-
 
4469
            opl3stereo  = AL_Stereo;
4481
            Menu_RefreshSoundProperties();
4470
        }
-
 
4471
        break;
4482
        break;
4472
4483
4473
    default:
4484
    default:
4474
        break;
4485
        break;
4475
    }
4486
    }