diff options
author | Samuel Villareal | 2010-08-31 01:37:11 +0000 |
---|---|---|
committer | Samuel Villareal | 2010-08-31 01:37:11 +0000 |
commit | b6ea4375e0b5db116a1cdf27e30273d4a92b7a53 (patch) | |
tree | e531ff8da0b7e4149d99b585d69469dfb4793e59 /src/strife/m_menu.c | |
parent | 1ae6058ab5c492f6f8e7fd606c9ad452f0b861ae (diff) | |
download | chocolate-doom-b6ea4375e0b5db116a1cdf27e30273d4a92b7a53.tar.gz chocolate-doom-b6ea4375e0b5db116a1cdf27e30273d4a92b7a53.tar.bz2 chocolate-doom-b6ea4375e0b5db116a1cdf27e30273d4a92b7a53.zip |
+ Strife music/sound implemented
+ All doom sound references replaced with sfx_swish as placeholder
+ Removed all but MT_PLAYER mobjinfo in mobjinfo struct
Subversion-branch: /branches/strife-branch
Subversion-revision: 1980
Diffstat (limited to 'src/strife/m_menu.c')
-rw-r--r-- | src/strife/m_menu.c | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/src/strife/m_menu.c b/src/strife/m_menu.c index 39dc66ec..5f2288c0 100644 --- a/src/strife/m_menu.c +++ b/src/strife/m_menu.c @@ -720,7 +720,7 @@ void M_QuickSaveResponse(int key) if (key == key_menu_confirm) { M_DoSave(quickSaveSlot); - S_StartSound(NULL,sfx_swtchx); + S_StartSound(NULL,sfx_swish); // villsa [STRIFE] TODO - fix sounds } } @@ -757,7 +757,7 @@ void M_QuickLoadResponse(int key) if (key == key_menu_confirm) { M_LoadSelect(quickSaveSlot); - S_StartSound(NULL,sfx_swtchx); + S_StartSound(NULL,sfx_swish); // villsa [STRIFE] TODO - fix sounds } } @@ -1130,28 +1130,29 @@ void M_FinishReadThis(int choice) // // M_QuitDOOM // +// villsa [STRIFE] TODO - fix sounds int quitsounds[8] = { - sfx_pldeth, - sfx_dmpain, - sfx_popain, - sfx_slop, - sfx_telept, - sfx_posit1, - sfx_posit3, - sfx_sgtatk + sfx_swish, + sfx_swish, + sfx_swish, + sfx_swish, + sfx_swish, + sfx_swish, + sfx_swish, + sfx_swish }; int quitsounds2[8] = { - sfx_vilact, - sfx_getpow, - sfx_boscub, - sfx_slop, - sfx_skeswg, - sfx_kntdth, - sfx_bspact, - sfx_sgtatk + sfx_swish, + sfx_swish, + sfx_swish, + sfx_swish, + sfx_swish, + sfx_swish, + sfx_swish, + sfx_swish }; @@ -1642,7 +1643,7 @@ boolean M_Responder (event_t* ev) messageRoutine(key); menuactive = false; - S_StartSound(NULL,sfx_swtchx); + S_StartSound(NULL,sfx_swish); // villsa [STRIFE] TODO - fix sounds return true; } @@ -1833,7 +1834,7 @@ boolean M_Responder (event_t* ev) else { currentMenu->menuitems[itemOn].routine(itemOn); - S_StartSound(NULL,sfx_pistol); + S_StartSound(NULL,sfx_swish); // villsa [STRIFE] TODO - fix sounds } } return true; @@ -1844,7 +1845,7 @@ boolean M_Responder (event_t* ev) currentMenu->lastOn = itemOn; M_ClearMenus (0); - S_StartSound(NULL,sfx_swtchx); + S_StartSound(NULL,sfx_swish); // villsa [STRIFE] TODO - fix sounds return true; } else if (key == key_menu_back) |