diff --git a/stepmania/src/LifeMeterBattery.cpp b/stepmania/src/LifeMeterBattery.cpp index ac12ae5a94..2c98dbda30 100644 --- a/stepmania/src/LifeMeterBattery.cpp +++ b/stepmania/src/LifeMeterBattery.cpp @@ -176,7 +176,7 @@ void LifeMeterBattery::Refresh() } else { - m_textNumLives.SetText( ssprintf("%d", m_iLivesLeft) ); + m_textNumLives.SetText( ssprintf("x%d", m_iLivesLeft) ); m_sprBattery.SetState( 3 ); } } diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp index 14a09f5bc3..df8f0d6ae2 100644 --- a/stepmania/src/RageDisplay.cpp +++ b/stepmania/src/RageDisplay.cpp @@ -59,7 +59,7 @@ RageDisplay::RageDisplay( HWND hWnd ) HRESULT hr; if( FAILED( hr = m_pd3d->GetDeviceCaps(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &m_DeviceCaps) ) ) { - throw RageException( + throw RageException( "There was an error while initializing your video card.\n\n" "Your system is reporting that Direct3D8 hardware acceleration\n" "is not available. In most cases, you can download an updated\n" diff --git a/stepmania/src/RageDisplay.h b/stepmania/src/RageDisplay.h index 235b772c9d..99b075d1f0 100644 --- a/stepmania/src/RageDisplay.h +++ b/stepmania/src/RageDisplay.h @@ -41,6 +41,7 @@ const int MAX_NUM_VERTICIES = MAX_NUM_QUADS*4; // 4 verticies per quad // verticies and not indexing. In fact, drawing indexed primitives is about 30% slower. // + class RageDisplay { friend class RageTexture; diff --git a/stepmania/src/RageInput.cpp b/stepmania/src/RageInput.cpp index 5eec6dfc79..b4c8b4715c 100644 --- a/stepmania/src/RageInput.cpp +++ b/stepmania/src/RageInput.cpp @@ -16,7 +16,7 @@ #pragma comment(lib, "dinput8.lib") #pragma comment(lib, "dxguid.lib") -#define HAVE_DDK +//#define HAVE_DDK #ifdef HAVE_DDK #pragma comment(lib, "setupapi.lib") #pragma comment(lib, "hid.lib") diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp index f636860cc8..6fb698cd35 100644 --- a/stepmania/src/RageLog.cpp +++ b/stepmania/src/RageLog.cpp @@ -102,7 +102,6 @@ void RageLog::Warn( const char *fmt, ...) "WARNING: %s\n" "/////////////////////////////////////////", sBuff ); - warnings.Add( sBuff ); } void RageLog::Flush() diff --git a/stepmania/src/RageLog.h b/stepmania/src/RageLog.h index 253787078a..7514287c8d 100644 --- a/stepmania/src/RageLog.h +++ b/stepmania/src/RageLog.h @@ -30,10 +30,6 @@ public: protected: FILE* m_fileLog; - /* Let's keep a list of all warnings, so we can display them later. - * We could write this to a file, instead, but for now let's not - * clutter the top dir ... */ - CStringArray warnings; }; extern RageLog* LOG; // global and accessable from anywhere in our program diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp index f80e8c1cea..2da24acb2d 100644 --- a/stepmania/src/RageSound.cpp +++ b/stepmania/src/RageSound.cpp @@ -17,19 +17,11 @@ #include "RageException.h" -RageSound* SOUND = NULL; - -#if 0 -RageSound::RageSound( HWND hWnd ) { } -RageSound::~RageSound() { } -void RageSound::PlayOnceStreamed( CString sPath ) { } -void RageSound::PlayOnceStreamedFromDir( CString sDir ) { } -#else - -#pragma comment(lib, "bass/bass.lib") - #include "bass/bass.h" +#pragma comment(lib, "bass/bass.lib") + +RageSound* SOUND = NULL; RageSound::RageSound( HWND hWnd ) @@ -121,4 +113,3 @@ void RageSound::PlayOnceStreamedFromDir( CString sDir ) PlayOnceStreamed( sDir + arraySoundFiles[index] ); } } -#endif diff --git a/stepmania/src/ScreenGraphicOptions.cpp b/stepmania/src/ScreenGraphicOptions.cpp index 61d4b007ed..180349947c 100644 --- a/stepmania/src/ScreenGraphicOptions.cpp +++ b/stepmania/src/ScreenGraphicOptions.cpp @@ -83,58 +83,19 @@ ScreenGraphicOptions::ScreenGraphicOptions() : MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","graphic options music") ); } -int ScreenGraphicOptions::CurrentRefresh() const -{ - int RefreshOption = m_iSelectedOption[0][GO_REFRESH_RATE]; - switch( RefreshOption ) - { - case 0: return RageDisplay::REFRESH_DEFAULT;break; - case 1: return RageDisplay::REFRESH_MAX; break; - default: - return atoi( g_GraphicOptionsLines[GO_REFRESH_RATE].szOptionsText[RefreshOption] ); - } -} - void ScreenGraphicOptions::UpdateRefreshRates() { -#if 0 CArray hz; - int OldSetting = CurrentRefresh(); - /* XXX: We're hardcoded to 16bpp in StepMania.cpp; if we add a bpp option * this needs to be changed. */ DISPLAY->GetHzAtResolution(HorizRes[m_iSelectedOption[0][GO_DISPLAY_RESOLUTION]], VertRes[m_iSelectedOption[0][GO_DISPLAY_RESOLUTION]], 16 /* XXX */, hz); - /* Set the refresh to default. If we can find the old selection in the - * new data, we'll set it to that later. */ - - int i; - OptionRowData &opt = g_GraphicOptionsLines[GO_REFRESH_RATE]; - opt.iNumOptions = 2; - int OldSettingNo = RageDisplay::REFRESH_DEFAULT; - - for(i = 2; i < MAX_OPTIONS_PER_LINE; ++i) - opt.szOptionsText[i][0] = 0; - - for(i = 0; i < hz.GetSize(); ++i) - { - if(hz[i] < 60) continue; - sprintf(opt.szOptionsText[opt.iNumOptions], "%i", hz[i]); - opt.iNumOptions++; - if( hz[i] == OldSetting ) - OldSettingNo = i; - } - - m_iSelectedOption[0][GO_REFRESH_RATE] = - m_iSelectedOption[1][GO_REFRESH_RATE] = OldSettingNo; - - InitOptionsText(); -#endif /* Disable all refresh rates (except DEFAULT/MAX). */ -// for(i = 0; i < g_GraphicOptionsLines[GO_REFRESH_RATE].iNumOptions; ++i) -// DimOption(GO_REFRESH_RATE, i, true); + int i; + for(i = 0; i < g_GraphicOptionsLines[GO_REFRESH_RATE].iNumOptions; ++i) + DimOption(GO_REFRESH_RATE, i, true); /* If we're windowed, leave all refresh rates dimmed, but don't * change the actual selection. */ @@ -142,29 +103,29 @@ void ScreenGraphicOptions::UpdateRefreshRates() return; /* Enable MAX and DEFAULT. */ -// DimOption(GO_REFRESH_RATE, 0, false); -// DimOption(GO_REFRESH_RATE, 1, false); + DimOption(GO_REFRESH_RATE, 0, false); + DimOption(GO_REFRESH_RATE, 1, false); /* Enable refresh rates. As we go, remember the highest * refresh found. */ -/* for(i = 0; i < hz.GetSize(); ++i) + for(i = 0; i < hz.GetSize(); ++i) { for(int j = 1; j < g_GraphicOptionsLines[GO_REFRESH_RATE].iNumOptions; ++j) { if(atoi(g_GraphicOptionsLines[GO_REFRESH_RATE].szOptionsText[j]) != hz[i]) continue; -*/ + /* This refresh is available. */ -/* DimOption(GO_REFRESH_RATE, j, false); + DimOption(GO_REFRESH_RATE, j, false); break; } } -*/ /* If current refresh is no longer valid, set it to default. */ -// int CurSel = m_iSelectedOption[0][GO_REFRESH_RATE]; -// if(m_OptionDim[GO_REFRESH_RATE][CurSel]) -// m_iSelectedOption[0][GO_REFRESH_RATE] = -// m_iSelectedOption[1][GO_REFRESH_RATE] = RageDisplay::REFRESH_DEFAULT; + /* If current refresh is no longer valid, set it to default. */ + int CurSel = m_iSelectedOption[0][GO_REFRESH_RATE]; + if(m_OptionDim[GO_REFRESH_RATE][CurSel]) + m_iSelectedOption[0][GO_REFRESH_RATE] = + m_iSelectedOption[1][GO_REFRESH_RATE] = RageDisplay::REFRESH_DEFAULT; PositionUnderlines(); } @@ -215,7 +176,7 @@ void ScreenGraphicOptions::ImportOptions() } m_iSelectedOption[0][GO_BGMODE] = PREFSMAN->m_BackgroundMode; - m_iSelectedOption[0][GO_BGBRIGHTNESS] = int(roundf( PREFSMAN->m_fBGBrightness*10 )); + m_iSelectedOption[0][GO_BGBRIGHTNESS] = (int)( PREFSMAN->m_fBGBrightness*10+0.5f ); m_iSelectedOption[0][GO_MOVIEDECODEMS] = PREFSMAN->m_iMovieDecodeMS-1; m_iSelectedOption[0][GO_BGIFNOBANNER] = PREFSMAN->m_bUseBGIfNoBanner ? 1:0; m_iSelectedOption[0][GO_VSYNC] = PREFSMAN->m_bVsync ? 1:0; @@ -239,15 +200,21 @@ void ScreenGraphicOptions::ExportOptions() case 2: PREFSMAN->m_iTextureResolution = 1024; break; default: ASSERT(0); PREFSMAN->m_iTextureResolution = 512; break; } - - int RefreshOption = m_iSelectedOption[0][GO_REFRESH_RATE]; - - switch( RefreshOption ) + + switch( m_iSelectedOption[0][GO_REFRESH_RATE] ) { case 0: PREFSMAN->m_iRefreshRate = RageDisplay::REFRESH_DEFAULT;break; case 1: PREFSMAN->m_iRefreshRate = RageDisplay::REFRESH_MAX; break; - default: - PREFSMAN->m_iRefreshRate = atoi( g_GraphicOptionsLines[GO_REFRESH_RATE].szOptionsText[RefreshOption] ); + case 2: PREFSMAN->m_iRefreshRate = 60; break; + case 3: PREFSMAN->m_iRefreshRate = 70; break; + case 4: PREFSMAN->m_iRefreshRate = 72; break; + case 5: PREFSMAN->m_iRefreshRate = 75; break; + case 6: PREFSMAN->m_iRefreshRate = 80; break; + case 7: PREFSMAN->m_iRefreshRate = 85; break; + case 8: PREFSMAN->m_iRefreshRate = 90; break; + case 9: PREFSMAN->m_iRefreshRate = 100; break; + case 10:PREFSMAN->m_iRefreshRate = 120; break; + default: ASSERT(0); PREFSMAN->m_iRefreshRate = 0; break; } PREFSMAN->m_BackgroundMode = PrefsManager::BackgroundMode( m_iSelectedOption[0][GO_BGMODE] ); diff --git a/stepmania/src/ScreenGraphicOptions.h b/stepmania/src/ScreenGraphicOptions.h index 9bad6d5dd3..45b6bc3240 100644 --- a/stepmania/src/ScreenGraphicOptions.h +++ b/stepmania/src/ScreenGraphicOptions.h @@ -8,10 +8,15 @@ Chris Danford ----------------------------------------------------------------------------- */ -#ifndef SCREEN_GRAPHIC_OPTIONS_H -#define SCREEN_GRAPHIC_OPTIONS_H +#include "Screen.h" #include "ScreenOptions.h" +#include "Sprite.h" +#include "BitmapText.h" +#include "RandomSample.h" +#include "TransitionFade.h" +#include "Quad.h" + class ScreenGraphicOptions : public ScreenOptions { @@ -27,7 +32,4 @@ private: void GoToNextState(); void GoToPrevState(); - int CurrentRefresh() const; }; - -#endif \ No newline at end of file