fixed some warnings

This commit is contained in:
Manu Evans
2004-01-31 02:17:47 +00:00
parent 173d4c2c84
commit c87e9ada30
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -587,13 +587,13 @@ CString RageDisplay_D3D::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut )
void RageDisplay_D3D::ResolutionChanged()
{
#ifdef _XBOX
g_CurrentParams.width = PREFSMAN->m_fScreenWidth;
g_CurrentParams.height = PREFSMAN->m_fScreenHeight;
g_CurrentParams.width = (int)PREFSMAN->m_fScreenWidth;
g_CurrentParams.height = (int)PREFSMAN->m_fScreenHeight;
D3DVIEWPORT8 viewData2 = { 0,0,640,480, 0.f, 1.f };
g_pd3dDevice->SetViewport( &viewData2 );
g_pd3dDevice->Clear( 0, NULL, D3DCLEAR_TARGET|D3DCLEAR_ZBUFFER,
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 );
#endif
// no need to clear because D3D uses an overlay
+1 -1
View File
@@ -55,7 +55,7 @@ ScreenEndlessBreak::ScreenEndlessBreak( CString sName ) : Screen( sName )
this->AddChild(&m_sprBreakPicture);
// 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
m_textTimeRemaining.LoadFromFont( THEME->GetPathToF("Common Normal") );