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

hi ho, const safety

Browse Source
This commit is contained in:
Glenn Maynard
2002-08-22 23:36:03 +00:00
parent 2564a200c8
commit a8dfdcbc9d
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameDef.cpp
+6 -6
View File
@@ -124,7 +124,7 @@ void GameDef::GetHoldTweenColors( const CString sSkinName, const CString sButton
return; return;
} }
void GameDef::GetSkinNames( CStringArray &AddTo ) void GameDef::GetSkinNames( CStringArray &AddTo ) const
{ {
CString sBaseSkinFolder = "Skins\\" + CString(m_szName) + "\\"; CString sBaseSkinFolder = "Skins\\" + CString(m_szName) + "\\";
GetDirListing( sBaseSkinFolder + "*.*", AddTo, true ); GetDirListing( sBaseSkinFolder + "*.*", AddTo, true );
@@ -138,7 +138,7 @@ void GameDef::GetSkinNames( CStringArray &AddTo )
throw RageException( "The folder '%s' must contain at least one skin.", sBaseSkinFolder ); throw RageException( "The folder '%s' must contain at least one skin.", sBaseSkinFolder );
} }
bool GameDef::HasASkinNamed( CString sSkin ) bool GameDef::HasASkinNamed( CString sSkin ) const
{ {
CStringArray asSkinNames; CStringArray asSkinNames;
GetSkinNames( asSkinNames ); GetSkinNames( asSkinNames );
@@ -150,7 +150,7 @@ bool GameDef::HasASkinNamed( CString sSkin )
return false; return false;
} }
void GameDef::AssertSkinsAreComplete() void GameDef::AssertSkinsAreComplete() const
{ {
CStringArray asSkinNames; CStringArray asSkinNames;
GetSkinNames( asSkinNames ); GetSkinNames( asSkinNames );
@@ -159,7 +159,7 @@ void GameDef::AssertSkinsAreComplete()
AssertSkinIsComplete( asSkinNames[i] ); AssertSkinIsComplete( asSkinNames[i] );
} }
void GameDef::AssertSkinIsComplete( CString sSkin ) void GameDef::AssertSkinIsComplete( CString sSkin ) const
{ {
CString sGameSkinFolder = "Skins\\" + sSkin + "\\"; CString sGameSkinFolder = "Skins\\" + sSkin + "\\";
@@ -173,7 +173,7 @@ void GameDef::AssertSkinIsComplete( CString sSkin )
} }
} }
MenuInput GameDef::GameInputToMenuInput( GameInput GameI ) MenuInput GameDef::GameInputToMenuInput( GameInput GameI ) const
{ {
PlayerNumber pn; PlayerNumber pn;
@@ -207,7 +207,7 @@ MenuInput GameDef::GameInputToMenuInput( GameInput GameI )
return MenuInput(); // invalid GameInput return MenuInput(); // invalid GameInput
} }
void GameDef::MenuInputToGameInput( MenuInput MenuI, GameInput GameIout[4] ) void GameDef::MenuInputToGameInput( MenuInput MenuI, GameInput GameIout[4] ) const
{ {
ASSERT( MenuI.IsValid() ); ASSERT( MenuI.IsValid() );
stepmania/src/GameDef.h
+6 -6
View File
@@ -73,14 +73,14 @@ public:
return GAME_BUTTON_INVALID; return GAME_BUTTON_INVALID;
} }
MenuInput GameInputToMenuInput( GameInput GameI ); MenuInput GameInputToMenuInput( GameInput GameI ) const;
void MenuInputToGameInput( MenuInput MenuI, GameInput GameIout[4] ); void MenuInputToGameInput( MenuInput MenuI, GameInput GameIout[4] ) const;
// note skin stuff // note skin stuff
void GetSkinNames( CStringArray &asSkinNames ); void GetSkinNames( CStringArray &asSkinNames ) const;
bool HasASkinNamed( CString sSkin ); bool HasASkinNamed( CString sSkin ) const;
void AssertSkinsAreComplete(); void AssertSkinsAreComplete() const;
void AssertSkinIsComplete( CString sSkin ); void AssertSkinIsComplete( CString sSkin ) const;
CString GetPathToGraphic( const CString sSkinName, const CString sButtonName, const SkinElement gbg ) const; CString GetPathToGraphic( const CString sSkinName, const CString sButtonName, const SkinElement gbg ) const;
void GetTapTweenColors( const CString sSkinName, const CString sButtonName, CArray<D3DXCOLOR,D3DXCOLOR> &aTapTweenColorsAddTo ) const; void GetTapTweenColors( const CString sSkinName, const CString sButtonName, CArray<D3DXCOLOR,D3DXCOLOR> &aTapTweenColorsAddTo ) const;
stepmania/src/InputMapper.cpp
+3 -3
View File
@@ -234,19 +234,19 @@ void InputMapper::GameToStyle( GameInput GameI, StyleInput &StyleI )
return; return;
} }
StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef(); const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
StyleI = pStyleDef->GameInputToStyleInput( GameI ); StyleI = pStyleDef->GameInputToStyleInput( GameI );
} }
void InputMapper::GameToMenu( GameInput GameI, MenuInput &MenuI ) void InputMapper::GameToMenu( GameInput GameI, MenuInput &MenuI )
{ {
GameDef* pGameDef = GAMESTATE->GetCurrentGameDef(); const GameDef* pGameDef = GAMESTATE->GetCurrentGameDef();
MenuI = pGameDef->GameInputToMenuInput( GameI ); MenuI = pGameDef->GameInputToMenuInput( GameI );
} }
void InputMapper::StyleToGame( StyleInput StyleI, GameInput &GameI ) void InputMapper::StyleToGame( StyleInput StyleI, GameInput &GameI )
{ {
StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef(); const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
GameI = pStyleDef->StyleInputToGameInput( StyleI ); GameI = pStyleDef->StyleInputToGameInput( StyleI );
} }