prettier test input

don't show secondary mappings if OnlyDedicatedMenuButtons is on
This commit is contained in:
Chris Danford
2005-04-23 22:50:13 +00:00
parent 0f9b2793f2
commit a29ac7a5fc
2 changed files with 25 additions and 28 deletions
+11 -20
View File
@@ -2703,11 +2703,8 @@ CString GameManager::GetMenuButtonSecondaryFunction( const Game *pGame, GameButt
* it) and/or map to a menu button (if m_DedicatedMenuButton or m_SecondaryMenuButton
* map to it).
*
* If a button is only used in gameplay, return ""; the primary description is
* sufficient.
*
* If a button is only used in menus, return "(dedicated)" if any other button
* maps to the same MenuButton; otherwise return "".
* If a button is only used in gameplay or is only used in menus, return ""; the
* primary description is sufficient.
*
* If a button is used in both gameplay and menus, return szSecondaryNames[] for
* the MenuButton.
@@ -2728,26 +2725,20 @@ CString GameManager::GetMenuButtonSecondaryFunction( const Game *pGame, GameButt
static const char *szSecondaryNames[NUM_MENU_BUTTONS] =
{
"(MenuLeft)",
"(MenuRight)",
"(MenuUp)",
"(MenuDown)",
"(MenuStart)",
"(MenuBack)",
"(Coin)",
"(Operator)"
"MenuLeft",
"MenuRight",
"MenuUp",
"MenuDown",
"MenuStart",
"MenuBack",
"Coin",
"Operator"
};
FOREACH_MenuButton(m)
{
if( !bUsedInGameplay && pGame->m_DedicatedMenuButton[m] == gb )
{
if( pGame->m_SecondaryMenuButton[m] == pGame->m_DedicatedMenuButton[m] ||
pGame->m_SecondaryMenuButton[m] == GAME_BUTTON_INVALID )
return "";
else
return "(dedicated)";
}
return "";
else if( bUsedInGameplay && pGame->m_SecondaryMenuButton[m] == gb )
return szSecondaryNames[m];
}