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

fix style table glitches

Browse Source 
const fixes
This commit is contained in:
Glenn Maynard
2004-12-04 04:30:39 +00:00
parent 12d5890ea9
commit d7a03bb37f
3 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameManager.cpp
+27 -27
View File
@@ -1144,8 +1144,8 @@ Style g_Styles[] =
}, },
}, },
{ // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS]
{ 0, 3, 2, 1 }, { 0, 3, 2, 1, Style::END_MAPPING },
{ 0, 3, 2, 1 } { 0, 3, 2, 1, Style::END_MAPPING }
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0, 1, 2, 3 0, 1, 2, 3
@@ -1178,8 +1178,8 @@ Style g_Styles[] =
}, },
}, },
{ {
{ 0, 3, 2, 1 }, { 0, 3, 2, 1, Style::END_MAPPING },
{ 0, 3, 2, 1 } { 0, 3, 2, 1, Style::END_MAPPING }
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0, 1, 2, 3 0, 1, 2, 3
@@ -1254,8 +1254,8 @@ Style g_Styles[] =
}, },
}, },
{ // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS]
{ 0, 3, 2, 1 }, { 0, 3, 2, 1, Style::END_MAPPING },
{ 0, 3, 2, 1 } { 0, 3, 2, 1, Style::END_MAPPING }
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,1,2,3 0,1,2,3
@@ -1292,8 +1292,8 @@ Style g_Styles[] =
}, },
}, },
{ // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS]
{ 0, 5, 3, 2, 1, 4 }, { 0, 5, 3, 2, 1, 4, Style::END_MAPPING },
{ 0, 5, 3, 2, 1, 4 } { 0, 5, 3, 2, 1, 4, Style::END_MAPPING }
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,1,2,3,4,5 0,1,2,3,4,5
@@ -1367,8 +1367,8 @@ Style g_Styles[] =
}, },
}, },
{ // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS]
{ 0, 5, 3, 2, 1, 4 }, { 0, 5, 3, 2, 1, 4, Style::END_MAPPING },
{ 0, 5, 3, 2, 1, 4 } { 0, 5, 3, 2, 1, 4, Style::END_MAPPING }
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,5,1,4,2,3 // outside in 0,5,1,4,2,3 // outside in
@@ -1478,7 +1478,7 @@ Style g_Styles[] =
}, },
{ // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS]
{ Style::NO_MAPPING, 1, 0, Style::NO_MAPPING, 2, Style::END_MAPPING }, { Style::NO_MAPPING, 1, 0, Style::NO_MAPPING, 2, Style::END_MAPPING },
{ 3, Style::NO_MAPPING, 5, 4, Style::NO_MAPPING } { 3, Style::NO_MAPPING, 5, 4, Style::NO_MAPPING, Style::END_MAPPING }
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,5,2,4,3,1 0,5,2,4,3,1
@@ -1523,8 +1523,8 @@ Style g_Styles[] =
}, },
}, },
{ // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS]
{ 1, 3, 2, 0, 4, 6, 8, 7, 5, 9, Style::END_MAPPING }, { 1, 3, 2, 0, 4, Style::END_MAPPING },
{ 1, 3, 2, 0, 4, 6, 8, 7, 5, 9, Style::END_MAPPING }, { 6, 8, 7, 5, 9, Style::END_MAPPING },
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,2,4,1,3,5,7,9,6,8 0,2,4,1,3,5,7,9,6,8
@@ -1798,8 +1798,8 @@ Style g_Styles[] =
}, },
}, },
{ // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS]
{ 0, 4, 2, 1, 3, 5, 9, 7, 6, 8, Style::END_MAPPING }, { 0, 4, 2, 1, 3, Style::END_MAPPING },
{ 0, 4, 2, 1, 3, 5, 9, 7, 6, 8, Style::END_MAPPING }, { 5, 9, 7, 6, 8, Style::END_MAPPING },
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
2,0,4,1,3,7,5,9,6,8 // This should be from back to front: Down, UpLeft, UpRight, Upper Left Hand, Upper Right Hand 2,0,4,1,3,7,5,9,6,8 // This should be from back to front: Down, UpLeft, UpRight, Upper Left Hand, Upper Right Hand
@@ -2210,8 +2210,8 @@ Style g_Styles[] =
}, },
}, },
{ // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS] { // m_iInputColumn[MAX_GAME_CONTROLLERS][MAX_GAME_BUTTONS]
{ 1, 2, 0, 3, 5, 6, 4, 7, Style::END_MAPPING }, { 1, 2, 0, 3, Style::END_MAPPING },
{ 1, 2, 0, 3, 5, 6, 4, 7, Style::END_MAPPING }, { 5, 6, 4, 7, Style::END_MAPPING },
}, },
{ // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER]; { // m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
0,1,2,3,4,5,6,7 0,1,2,3,4,5,6,7
@@ -2672,7 +2672,7 @@ GameManager::~GameManager()
{ {
} }
void GameManager::GetStylesForGame( const Game *pGame, vector<const Style*>& aStylesAddTo, bool editor ) void GameManager::GetStylesForGame( const Game *pGame, vector<const Style*>& aStylesAddTo, bool editor ) const
{ {
for( unsigned s=0; s<NUM_STYLES; s++ ) for( unsigned s=0; s<NUM_STYLES; s++ )
{ {
@@ -2688,7 +2688,7 @@ void GameManager::GetStylesForGame( const Game *pGame, vector<const Style*>& aSt
} }
} }
const Style* GameManager::GetEditorStyleForStepsType( StepsType st ) const Style* GameManager::GetEditorStyleForStepsType( StepsType st ) const
{ {
for( unsigned s=0; s<NUM_STYLES; s++ ) for( unsigned s=0; s<NUM_STYLES; s++ )
{ {
@@ -2702,7 +2702,7 @@ const Style* GameManager::GetEditorStyleForStepsType( StepsType st )
} }
void GameManager::GetStepsTypesForGame( const Game *pGame, vector<StepsType>& aStepsTypeAddTo ) void GameManager::GetStepsTypesForGame( const Game *pGame, vector<StepsType>& aStepsTypeAddTo ) const
{ {
FOREACH_StepsType( st ) FOREACH_StepsType( st )
{ {
@@ -2720,7 +2720,7 @@ void GameManager::GetStepsTypesForGame( const Game *pGame, vector<StepsType>& aS
} }
} }
const Style* GameManager::GetDemonstrationStyleForGame( const Game *pGame ) const Style* GameManager::GetDemonstrationStyleForGame( const Game *pGame ) const
{ {
for( unsigned s=0; s<NUM_STYLES; s++ ) for( unsigned s=0; s<NUM_STYLES; s++ )
{ {
@@ -2733,7 +2733,7 @@ const Style* GameManager::GetDemonstrationStyleForGame( const Game *pGame )
return NULL; return NULL;
} }
const Style* GameManager::GetHowToPlayStyleForGame( const Game *pGame ) const Style* GameManager::GetHowToPlayStyleForGame( const Game *pGame ) const
{ {
for( unsigned s=0; s<NUM_STYLES; s++ ) for( unsigned s=0; s<NUM_STYLES; s++ )
{ {
@@ -2746,7 +2746,7 @@ const Style* GameManager::GetHowToPlayStyleForGame( const Game *pGame )
return NULL; return NULL;
} }
void GameManager::GetEnabledGames( vector<const Game*>& aGamesOut ) void GameManager::GetEnabledGames( vector<const Game*>& aGamesOut ) const
{ {
for( int g=0; g<NUM_GAMES; g++ ) for( int g=0; g<NUM_GAMES; g++ )
{ {
@@ -2756,12 +2756,12 @@ void GameManager::GetEnabledGames( vector<const Game*>& aGamesOut )
} }
} }
const Game* GameManager::GetDefaultGame() const Game* GameManager::GetDefaultGame() const
{ {
return &g_Games[0]; return &g_Games[0];
} }
int GameManager::GetIndexFromGame( const Game* pGame ) int GameManager::GetIndexFromGame( const Game* pGame ) const
{ {
for( int g=0; g<NUM_GAMES; g++ ) for( int g=0; g<NUM_GAMES; g++ )
{ {
@@ -2772,14 +2772,14 @@ int GameManager::GetIndexFromGame( const Game* pGame )
return 0; return 0;
} }
const Game* GameManager::GetGameFromIndex( int index ) const Game* GameManager::GetGameFromIndex( int index ) const
{ {
ASSERT( index >= 0 ); ASSERT( index >= 0 );
ASSERT( index < NUM_GAMES ); ASSERT( index < NUM_GAMES );
return &g_Games[index]; return &g_Games[index];
} }
bool GameManager::IsGameEnabled( const Game *pGame ) bool GameManager::IsGameEnabled( const Game *pGame ) const
{ {
CStringArray asNoteSkins; CStringArray asNoteSkins;
NOTESKIN->GetNoteSkinNames( pGame, asNoteSkins, false ); /* don't omit default */ NOTESKIN->GetNoteSkinNames( pGame, asNoteSkins, false ); /* don't omit default */
stepmania/src/GameManager.h
+11 -12
View File
@@ -3,7 +3,6 @@
#ifndef GAMEMANAGER_H #ifndef GAMEMANAGER_H
#define GAMEMANAGER_H #define GAMEMANAGER_H
class IniFile;
class Style; class Style;
class Game; class Game;
@@ -15,18 +14,18 @@ public:
GameManager(); GameManager();
~GameManager(); ~GameManager();
void GetStylesForGame( const Game* pGame, vector<const Style*>& aStylesAddTo, bool editor=false ); void GetStylesForGame( const Game* pGame, vector<const Style*>& aStylesAddTo, bool editor=false ) const;
void GetAllStyles( vector<const Style*>& aStylesAddTo, bool editor=false ); void GetAllStyles( vector<const Style*>& aStylesAddTo, bool editor=false ) const;
void GetStepsTypesForGame( const Game* pGame, vector<StepsType>& aStepsTypeAddTo ); void GetStepsTypesForGame( const Game* pGame, vector<StepsType>& aStepsTypeAddTo ) const;
const Style* GetEditorStyleForStepsType( StepsType st ); const Style* GetEditorStyleForStepsType( StepsType st ) const;
const Style* GetDemonstrationStyleForGame( const Game* pGame ); const Style* GetDemonstrationStyleForGame( const Game* pGame ) const;
const Style* GetHowToPlayStyleForGame( const Game* pGame ); const Style* GetHowToPlayStyleForGame( const Game* pGame ) const;
void GetEnabledGames( vector<const Game*>& aGamesOut ); void GetEnabledGames( vector<const Game*>& aGamesOut ) const;
const Game* GetDefaultGame(); const Game* GetDefaultGame() const;
bool IsGameEnabled( const Game* pGame ); bool IsGameEnabled( const Game* pGame ) const;
int GetIndexFromGame( const Game* pGame ); int GetIndexFromGame( const Game* pGame ) const;
const Game* GetGameFromIndex( int index ); const Game* GetGameFromIndex( int index ) const;
static int StepsTypeToNumTracks( StepsType st ); static int StepsTypeToNumTracks( StepsType st );
static StepsType StringToStepsType( CString sStepsType ); static StepsType StringToStepsType( CString sStepsType );
stepmania/src/Style.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ StyleInput Style::GameInputToStyleInput( const GameInput &GameI ) const
if( m_iInputColumn[0][0] == NO_MAPPING ) if( m_iInputColumn[0][0] == NO_MAPPING )
return SI; // Return invalid. return SI; // Return invalid.
for( int i = 0; i < GameI.button; ++i ) for( int i = 0; i <= GameI.button; ++i )
if( m_iInputColumn[GameI.controller][i] == END_MAPPING ) if( m_iInputColumn[GameI.controller][i] == END_MAPPING )
return SI; // Return invalid. return SI; // Return invalid.