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

Remove Xbox stuff from LoadingWindow_SDL; I don't think that build uses SDL anymore. Note that this type of platform-specific stuff doesn't belong in generic drivers like this ...

Browse Source
This commit is contained in:
Glenn Maynard
2005-01-20 01:44:46 +00:00
parent 1a1ab12c1f
commit ce043592f3
2 changed files with 2 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp
-63
View File
@@ -10,8 +10,6 @@
#include "RageSurfaceUtils.h"
#include "RageSurfaceUtils_Zoom.h"
/* XXX: What is all this Xbox junk doing in LoadingWindow_SDL? */
LoadingWindow_SDL::LoadingWindow_SDL()
{
/* There's no consistent way to hint SDL that we want a centered
@@ -64,34 +62,6 @@ LoadingWindow_SDL::LoadingWindow_SDL()
if( loading_screen == NULL )
RageException::Throw( "Couldn't initialize loading window: %s", SDL_GetError() );
#ifdef _XBOX
//SDL_XBOX_SetScreenPosition( 70, 48 ) ; figure out another way to do this
//SDL_XBOX_SetScreenStretch( -150, -300 ) ;
if( FAILED ( XFONT_OpenDefaultFont( &m_pConsoleTTF ) ) )
{
m_pConsoleTTF = 0 ;
}
else
{
m_pConsoleTTF->SetTextHeight( 24 );
// Change Font Style - XFONT_NORMAL, XFONT_BOLD,
// XFONT_ITALICS, XFONT_BOLDITALICS
m_pConsoleTTF->SetTextStyle( XFONT_NORMAL );
// Anti-Alias the font -- 0 for no anti-alias, 2 for some, 4 for MAX!
m_pConsoleTTF->SetTextAntialiasLevel( 2 );
m_pConsoleTTF->SetTextColor( 0xFFFFFFFF ) ;
m_pConsoleTTF->SetBkColor( 0x00000000 ) ;
m_pConsoleTTF->SetBkMode(XFONT_OPAQUE) ;
SetText( CString("Loading Songs" ) ) ;
}
#endif
{
SDL_Surface *pSDLSurface = SDLSurfaceFromRageSurface( srf );
SDL_BlitSurface( pSDLSurface, NULL, loading_screen, NULL );
@@ -103,13 +73,6 @@ LoadingWindow_SDL::LoadingWindow_SDL()
SDL_UpdateRect( loading_screen, 0,0,0,0 );
}
#ifdef _XBOX
void LoadingWindow_SDL::SetText(CString str)
{
m_cstrText = str ;
}
#endif
LoadingWindow_SDL::~LoadingWindow_SDL()
{
SDL_QuitSubSystem( SDL_INIT_VIDEO );
@@ -117,33 +80,7 @@ LoadingWindow_SDL::~LoadingWindow_SDL()
void LoadingWindow_SDL::Paint()
{
#ifdef _XBOX
LPDIRECT3DSURFACE8 m_primarySurface;
int x,y ;
unsigned int val ;
if ( m_pConsoleTTF )
{
WCHAR msg[1000] ;
swprintf( msg, L"%S", m_cstrText.c_str() ) ;
if ( m_pConsoleTTF->GetTextExtent( msg, -1, &val ) != S_OK )
{
val = 100 ;
}
x = (640-val)/2 ;
y = 350 ;
D3D__pDevice->GetRenderTarget( &m_primarySurface ) ;
m_pConsoleTTF->TextOut( m_primarySurface, L" ", -1, (float)0, (float)y ) ;
m_pConsoleTTF->TextOut( m_primarySurface, msg, wcslen(msg), (float)x, (float)y ) ;
m_primarySurface->Release() ;
D3D__pDevice->Present(NULL, NULL, NULL, NULL) ;
}
#else
SDL_UpdateRect(loading_screen, 0,0,0,0);
#endif
}
/*