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

added couple game mode and added couple and solo to Select Style

Browse Source
This commit is contained in:
Chris Danford
2002-01-21 21:09:06 +00:00
parent b8ff93249b
commit 38c125ff4d
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Player.cpp
+7 -4
View File
@@ -99,8 +99,9 @@ Player::Player( PlayerOptions po, PlayerNumber pn )
switch( GAMEINFO->m_GameMode )
{
case single4:
case versus4:
case MODE_SINGLE:
case MODE_VERSUS:
case MODE_COUPLE:
m_iNumColumns = 4; // LEFT, DOWN, UP, RIGHT
m_StepToColumnNumber[STEP_PAD1_LEFT] = 0;
m_StepToColumnNumber[STEP_PAD1_DOWN] = 1;
@@ -115,7 +116,7 @@ Player::Player( PlayerOptions po, PlayerNumber pn )
m_ColumnToRotation[2] = mapStepToRotation[STEP_PAD1_UP];
m_ColumnToRotation[3] = mapStepToRotation[STEP_PAD1_RIGHT];
break;
case single6:
case MODE_SOLO:
m_iNumColumns = 6; // LEFT, UP+LEFT, DOWN, UP, UP+RIGHT, RIGHT
m_StepToColumnNumber[STEP_PAD1_LEFT] = 0;
m_StepToColumnNumber[STEP_PAD1_UPLEFT] = 1;
@@ -136,7 +137,7 @@ Player::Player( PlayerOptions po, PlayerNumber pn )
m_ColumnToRotation[4] = mapStepToRotation[STEP_PAD1_UPRIGHT];
m_ColumnToRotation[5] = mapStepToRotation[STEP_PAD1_RIGHT];
break;
case double4:
case MODE_DOUBLE:
m_iNumColumns = 8; // 1_LEFT, 1_DOWN, 1_UP, 1_RIGHT, 2_LEFT, 2_DOWN, 2_UP, 2_RIGHT
m_StepToColumnNumber[STEP_PAD1_LEFT] = 0;
m_StepToColumnNumber[STEP_PAD1_DOWN] = 1;
@@ -163,6 +164,8 @@ Player::Player( PlayerOptions po, PlayerNumber pn )
m_ColumnToRotation[6] = mapStepToRotation[STEP_PAD2_UP];
m_ColumnToRotation[7] = mapStepToRotation[STEP_PAD2_RIGHT];
break;
default:
ASSERT( true ); // invalid GameMode
}
stepmania/src/Song.cpp
+9 -5
View File
@@ -612,19 +612,23 @@ void Song::GetStepsThatMatchGameMode( GameMode gm, CArray<Steps*, Steps*&>& arra
switch( gm ) // different logic for different game modes
{
case single4:
case MODE_SINGLE:
if( sm == Steps::SMsingle4 )
arrayAddTo.Add( pCurrentSteps );
break;
case single6:
case MODE_SOLO:
if( sm == Steps::SMsingle6 )
arrayAddTo.Add( pCurrentSteps );
break;
case versus4:
if( sm == Steps::SMsingle4 || sm == Steps::SMcouple || sm == Steps::SMbattle )
case MODE_VERSUS:
if( sm == Steps::SMsingle4 )
arrayAddTo.Add( pCurrentSteps );
break;
case double4:
case MODE_COUPLE:
if( sm == Steps::SMcouple || sm == Steps::SMbattle )
arrayAddTo.Add( pCurrentSteps );
break;
case MODE_DOUBLE:
if( sm == Steps::SMdouble4 )
arrayAddTo.Add( pCurrentSteps );
break;
stepmania/src/ThemeManager.cpp
+3 -2
View File
@@ -63,8 +63,9 @@ CString ThemeManager::GetPathTo( ThemeElement te, CString sThemeName )
case GRAPHIC_DANCER_P2: sAssetPath = "Graphics\\dancer p2"; break;
case GRAPHIC_PAD_SINGLE: sAssetPath = "Graphics\\Pad single"; break;
case GRAPHIC_PAD_DOUBLE: sAssetPath = "Graphics\\Pad double"; break;
case GRAPHIC_STYLE_ICONS: sAssetPath = "Graphics\\style icons 1x4"; break;
case GRAPHIC_STYLE_EXPLANATIONS: sAssetPath = "Graphics\\style explanations 1x8"; break;
case GRAPHIC_PAD_SOLO: sAssetPath = "Graphics\\Pad solo"; break;
case GRAPHIC_STYLE_ICONS: sAssetPath = "Graphics\\style icons 1x5"; break;
case GRAPHIC_STYLE_EXPLANATIONS: sAssetPath = "Graphics\\style explanations 1x10"; break;
case GRAPHIC_MUSIC_SELECTION_HIGHLIGHT: sAssetPath = "Graphics\\music selection highlight"; break;
case GRAPHIC_STEPS_DESCRIPTION: sAssetPath = "Graphics\\steps description 1x8"; break;
case GRAPHIC_SECTION_BACKGROUND: sAssetPath = "Graphics\\section background"; break;
stepmania/src/ThemeManager.h
+1
View File
@@ -53,6 +53,7 @@ enum ThemeElement {
GRAPHIC_DANCER_P2,
GRAPHIC_PAD_SINGLE,
GRAPHIC_PAD_DOUBLE,
GRAPHIC_PAD_SOLO,
GRAPHIC_STYLE_ICONS,
GRAPHIC_STYLE_EXPLANATIONS,
GRAPHIC_MUSIC_SELECTION_HIGHLIGHT,