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

Replaced most D3DX dependencies. Added Brendan's not-yet-functional networking code.

Browse Source
This commit is contained in:
Chris Danford
2002-10-28 05:30:45 +00:00
parent 5110da12d3
commit 73f7db6b15
99 changed files with 1203 additions and 718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenMapControllers.cpp
+7 -7
View File
@@ -82,7 +82,7 @@ ScreenMapControllers::ScreenMapControllers()
m_textError.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textError.SetText( "" );
m_textError.SetXY( CENTER_X, CENTER_Y );
m_textError.SetDiffuse( D3DXCOLOR(0,1,0,0) );
m_textError.SetDiffuse( RageColor(0,1,0,0) );
m_textError.SetZoom( 0.8f );
this->AddChild( &m_textError );
@@ -152,10 +152,10 @@ void ScreenMapControllers::Input( const DeviceInput& DeviceI, const InputEventTy
{
//m_textError.SetText( "Game option is set to ignore the Joystick D-Pad." );
//m_fErrorDisplayCountdown = 5; // show the error message
m_textError.SetDiffuse( D3DXCOLOR(0,1,0,1) );
m_textError.SetDiffuse( RageColor(0,1,0,1) );
m_textError.BeginTweening( 3 );
m_textError.BeginTweening( 1 );
m_textError.SetTweenDiffuse( D3DXCOLOR(0,1,0,0) );
m_textError.SetTweenDiffuse( RageColor(0,1,0,0) );
return; // ignore this press
}
@@ -260,16 +260,16 @@ void ScreenMapControllers::Refresh()
m_textMappedTo[p][b][s].SetText( "-----------" );
// highlight the currently selected pad button
D3DXCOLOR color;
RageColor color;
if( p == m_iCurController && b == m_iCurButton && s == m_iCurSlot )
{
if( m_bWaitingForPress )
color = D3DXCOLOR(1,0.5,0.5,1); // red
color = RageColor(1,0.5,0.5,1); // red
else
color = D3DXCOLOR(1,1,1,1); // white
color = RageColor(1,1,1,1); // white
}
else
color = D3DXCOLOR(0.5,0.5,0.5,1); // gray
color = RageColor(0.5,0.5,0.5,1); // gray
m_textMappedTo[p][b][s].SetDiffuse( color );
}
}