actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GetSecondaryMenuButtonName -> GetMenuButtonSecondaryFunction

Browse Source
This commit is contained in:
Glenn Maynard
2004-12-04 04:50:18 +00:00
parent bc9ad4169d
commit 783e492b0b
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameManager.cpp
+1 -1
View File
@@ -2694,7 +2694,7 @@ const Style* GameManager::GameAndStringToStyle( const Game *game, CString sStyle
} }
CString GameManager::GetSecondaryMenuButtonName( const Game *pGame, GameButton gb ) const CString GameManager::GetMenuButtonSecondaryFunction( const Game *pGame, GameButton gb ) const
{ {
/* /*
* Each GameButton can be used in gameplay (if any gameplay style maps to * Each GameButton can be used in gameplay (if any gameplay style maps to
stepmania/src/GameManager.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
static const Game* StringToGameType( CString sGameType ); static const Game* StringToGameType( CString sGameType );
const Style* GameAndStringToStyle( const Game* pGame, CString sStyle ); const Style* GameAndStringToStyle( const Game* pGame, CString sStyle );
static CString StyleToThemedString( const Style* s ); static CString StyleToThemedString( const Style* s );
CString GetSecondaryMenuButtonName( const Game *pGame, GameButton gb ) const; CString GetMenuButtonSecondaryFunction( const Game *pGame, GameButton gb ) const;
}; };
extern GameManager* GAMEMAN; // global and accessable from anywhere in our program extern GameManager* GAMEMAN; // global and accessable from anywhere in our program
stepmania/src/ScreenMapControllers.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ ScreenMapControllers::ScreenMapControllers( CString sClassName ) : ScreenWithMen
for( int b=0; b<GAMESTATE->GetCurrentGame()->m_iButtonsPerController; b++ ) for( int b=0; b<GAMESTATE->GetCurrentGame()->m_iButtonsPerController; b++ )
{ {
CString sName = GAMESTATE->GetCurrentGame()->m_szButtonNames[b]; CString sName = GAMESTATE->GetCurrentGame()->m_szButtonNames[b];
CString sSecondary = GAMEMAN->GetSecondaryMenuButtonName( GAMESTATE->GetCurrentGame(), b ); CString sSecondary = GAMEMAN->GetMenuButtonSecondaryFunction( GAMESTATE->GetCurrentGame(), b );
m_textName[b].LoadFromFont( THEME->GetPathToF("Common title") ); m_textName[b].LoadFromFont( THEME->GetPathToF("Common title") );
m_textName[b].SetXY( SCREEN_CENTER_X, -6 ); m_textName[b].SetXY( SCREEN_CENTER_X, -6 );
stepmania/src/ScreenTestInput.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ void ScreenTestInput::Update( float fDeltaTime )
if( INPUTMAPPER->DeviceToGame(di,gi) ) if( INPUTMAPPER->DeviceToGame(di,gi) )
{ {
CString sName = GAMESTATE->GetCurrentGame()->m_szButtonNames[gi.button]; CString sName = GAMESTATE->GetCurrentGame()->m_szButtonNames[gi.button];
CString sSecondary = GAMEMAN->GetSecondaryMenuButtonName( GAMESTATE->GetCurrentGame(), gi.button ); CString sSecondary = GAMEMAN->GetMenuButtonSecondaryFunction( GAMESTATE->GetCurrentGame(), gi.button );
sTemp += ssprintf(" (Controller %d %s) %s", gi.controller+1, sName.c_str(), sSecondary.c_str() ); sTemp += ssprintf(" (Controller %d %s) %s", gi.controller+1, sName.c_str(), sSecondary.c_str() );
} }