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

more of the same

Browse Source
This commit is contained in:
Glenn Maynard
2002-09-07 10:43:16 +00:00
parent 6460b7ae88
commit 1f112d3c25
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameDef.cpp
+1 -2
View File
@@ -61,7 +61,6 @@ CString GameDef::GetPathToGraphic( const CString sSkinName, const CString sButto
ASSERT(0); ASSERT(0);
throw RageException( "The game button graphic '%s%s %s' is missing.", sSkinDir, sButtonName, sGraphicSuffix ); throw RageException( "The game button graphic '%s%s %s' is missing.", sSkinDir, sButtonName, sGraphicSuffix );
return "";
} }
void GameDef::GetTapTweenColors( const CString sSkinName, const CString sButtonName, CArray<D3DXCOLOR,D3DXCOLOR> &aTapColorsOut ) const void GameDef::GetTapTweenColors( const CString sSkinName, const CString sButtonName, CArray<D3DXCOLOR,D3DXCOLOR> &aTapColorsOut ) const
@@ -192,7 +191,7 @@ MenuInput GameDef::GameInputToMenuInput( GameInput GameI ) const
pn = GAMESTATE->m_MasterPlayerNumber; pn = GAMESTATE->m_MasterPlayerNumber;
break; break;
default: default:
ASSERT(0); // invalid m_StyleType ASSERT(0); return MenuInput(); // invalid m_StyleType
}; };
for( int i=0; i<NUM_MENU_BUTTONS; i++ ) for( int i=0; i<NUM_MENU_BUTTONS; i++ )
stepmania/src/RandomSample.cpp
+10 -11
View File
@@ -68,20 +68,19 @@ void RandomSample::PlayRandom()
if( m_pSamples.GetSize() == 0 ) if( m_pSamples.GetSize() == 0 )
{ {
LOG->Trace( "WARNING: Tried to play a RandomSample that has 0 sounds loaded." ); LOG->Trace( "WARNING: Tried to play a RandomSample that has 0 sounds loaded." );
return;
} }
else
{
int iIndexToPlay;
for( int i=0; i<5; i++ )
{
iIndexToPlay = rand() % m_pSamples.GetSize();
if( iIndexToPlay != m_iIndexLastPlayed )
break;
}
m_pSamples[iIndexToPlay]->Play(); int iIndexToPlay = 0;
m_iIndexLastPlayed = iIndexToPlay; for( int i=0; i<5; i++ )
{
iIndexToPlay = rand() % m_pSamples.GetSize();
if( iIndexToPlay != m_iIndexLastPlayed )
break;
} }
m_pSamples[iIndexToPlay]->Play();
m_iIndexLastPlayed = iIndexToPlay;
} }
void RandomSample::Pause() void RandomSample::Pause()
stepmania/src/ScreenGameplay.cpp
+2 -2
View File
@@ -812,7 +812,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
{ {
case DIK_F9: fOffsetDelta = -0.025f; break; case DIK_F9: fOffsetDelta = -0.025f; break;
case DIK_F10: fOffsetDelta = +0.025f; break; case DIK_F10: fOffsetDelta = +0.025f; break;
default: ASSERT(0); default: ASSERT(0); return;
} }
if( type == IET_FAST_REPEAT ) if( type == IET_FAST_REPEAT )
fOffsetDelta *= 10; fOffsetDelta *= 10;
@@ -838,7 +838,7 @@ void ScreenGameplay::Input( const DeviceInput& DeviceI, const InputEventType typ
{ {
case DIK_F11: fOffsetDelta = -0.02f; break; case DIK_F11: fOffsetDelta = -0.02f; break;
case DIK_F12: fOffsetDelta = +0.02f; break; case DIK_F12: fOffsetDelta = +0.02f; break;
default: ASSERT(0); default: ASSERT(0); return;
} }
if( type == IET_FAST_REPEAT ) if( type == IET_FAST_REPEAT )
fOffsetDelta *= 10; fOffsetDelta *= 10;