fixed some warnings
This commit is contained in:
@@ -587,13 +587,13 @@ CString RageDisplay_D3D::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut )
|
|||||||
void RageDisplay_D3D::ResolutionChanged()
|
void RageDisplay_D3D::ResolutionChanged()
|
||||||
{
|
{
|
||||||
#ifdef _XBOX
|
#ifdef _XBOX
|
||||||
g_CurrentParams.width = PREFSMAN->m_fScreenWidth;
|
g_CurrentParams.width = (int)PREFSMAN->m_fScreenWidth;
|
||||||
g_CurrentParams.height = PREFSMAN->m_fScreenHeight;
|
g_CurrentParams.height = (int)PREFSMAN->m_fScreenHeight;
|
||||||
D3DVIEWPORT8 viewData2 = { 0,0,640,480, 0.f, 1.f };
|
D3DVIEWPORT8 viewData2 = { 0,0,640,480, 0.f, 1.f };
|
||||||
g_pd3dDevice->SetViewport( &viewData2 );
|
g_pd3dDevice->SetViewport( &viewData2 );
|
||||||
g_pd3dDevice->Clear( 0, NULL, D3DCLEAR_TARGET|D3DCLEAR_ZBUFFER,
|
g_pd3dDevice->Clear( 0, NULL, D3DCLEAR_TARGET|D3DCLEAR_ZBUFFER,
|
||||||
D3DCOLOR_XRGB(0,0,0), 1.0f, 0x00000000 );
|
D3DCOLOR_XRGB(0,0,0), 1.0f, 0x00000000 );
|
||||||
D3DVIEWPORT8 viewData = { PREFSMAN->m_fScreenPosX, PREFSMAN->m_fScreenPosY, g_CurrentParams.width, g_CurrentParams.height, 0.f, 1.f };
|
D3DVIEWPORT8 viewData = { (DWORD)PREFSMAN->m_fScreenPosX, (DWORD)PREFSMAN->m_fScreenPosY, g_CurrentParams.width, g_CurrentParams.height, 0.f, 1.f };
|
||||||
g_pd3dDevice->SetViewport( &viewData );
|
g_pd3dDevice->SetViewport( &viewData );
|
||||||
#endif
|
#endif
|
||||||
// no need to clear because D3D uses an overlay
|
// no need to clear because D3D uses an overlay
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ ScreenEndlessBreak::ScreenEndlessBreak( CString sName ) : Screen( sName )
|
|||||||
this->AddChild(&m_sprBreakPicture);
|
this->AddChild(&m_sprBreakPicture);
|
||||||
|
|
||||||
// Set up our countdown clock.
|
// Set up our countdown clock.
|
||||||
m_fCountdownSecs = (PREFSMAN->m_iEndlessBreakLength*60); // Stored in minutes.
|
m_fCountdownSecs = (float)(PREFSMAN->m_iEndlessBreakLength*60); // Stored in minutes.
|
||||||
|
|
||||||
//BitmapText stuff
|
//BitmapText stuff
|
||||||
m_textTimeRemaining.LoadFromFont( THEME->GetPathToF("Common Normal") );
|
m_textTimeRemaining.LoadFromFont( THEME->GetPathToF("Common Normal") );
|
||||||
|
|||||||
Reference in New Issue
Block a user