# HG changeset patch # User David Anderson # Date 1185990698 0 # Node ID 51a088fbf549e34567c5741669db23a3856657b8 # Parent 3fc9ab811b9f417c982c42d6c388ee67d9dd8ff2 added sound option for normal "exit" diff -r 3fc9ab811b9f -r 51a088fbf549 configs/core.cfg --- a/configs/core.cfg Wed Aug 01 16:52:51 2007 +0000 +++ b/configs/core.cfg Wed Aug 01 17:51:38 2007 +0000 @@ -57,6 +57,12 @@ * Specifies the sound that gets played when an item is selected from a menu. */ "MenuItemSound" "buttons/button14.wav" + + /** + * Specifies the sound that gets played when an "Exit" button is selected + * from a menu. + */ + "MenuExitSound" "buttons/combine_button7.wav" /** * Specifies the sound that gets played when an "Exit Back" button is selected diff -r 3fc9ab811b9f -r 51a088fbf549 core/MenuManager.cpp --- a/core/MenuManager.cpp Wed Aug 01 16:52:51 2007 +0000 +++ b/core/MenuManager.cpp Wed Aug 01 17:51:38 2007 +0000 @@ -843,6 +843,9 @@ } else if (strcmp(key, "MenuExitBackSound") == 0) { m_ExitBackSound.assign(value); return ConfigResult_Accept; + } else if (strcmp(key, "MenuExitSound") == 0) { + m_ExitSound.assign(value); + return ConfigResult_Accept; } return ConfigResult_Ignore; @@ -856,7 +859,6 @@ { case ItemSel_Back: case ItemSel_Next: - case ItemSel_Exit: case ItemSel_Item: { if (m_SelectSound.size() > 0) @@ -873,6 +875,14 @@ } break; } + case ItemSel_Exit: + { + if (m_ExitSound.size() > 0) + { + sound= m_ExitSound.c_str(); + } + break; + } default: { break; diff -r 3fc9ab811b9f -r 51a088fbf549 core/MenuManager.h --- a/core/MenuManager.h Wed Aug 01 16:52:51 2007 +0000 +++ b/core/MenuManager.h Wed Aug 01 17:51:38 2007 +0000 @@ -135,6 +135,7 @@ HandleType_t m_MenuType; String m_SelectSound; String m_ExitBackSound; + String m_ExitSound; }; extern MenuManager g_Menus;