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

Move Numbers graphics into separate Number asset folder

Browse Source 
Added precise timing window adjustment for each judge grade
Changed "hold START for options" to a Sprite
This commit is contained in:
Chris Danford
2002-09-22 18:18:50 +00:00
parent 1d0c17dd0f
commit bce306dcdc
21 changed files with 168 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/NEWS
+4
View File
@@ -1,4 +1,8 @@
------------------------CVS after 3.00 beta 6---------------- ------------------------CVS after 3.00 beta 6----------------
NEW FEATURE: Precise adjustment of timing window for each grade via the
stepmania.ini file (see JudgeWindowPerfectPercent, JudgeWindowGreatPercent,
etc).
OPTIMIZATION: Better texture caching algorithm for faster loading of menus.
NEW FEATURE: Ez2SelectStyle ScrollingList Contents now Metric Configurable. NEW FEATURE: Ez2SelectStyle ScrollingList Contents now Metric Configurable.
NEW FEATURE: PPP and PUMP use Ez2SelectStyle Menus to become more NEW FEATURE: PPP and PUMP use Ez2SelectStyle Menus to become more
arcade-accurate. arcade-accurate.
stepmania/TODO.chris
+5
View File
@@ -2,6 +2,11 @@
Fix Fix
///////////////////////// /////////////////////////
on Ez2, the Ranking doesn't save (AAA, AA, A, B e.t.c.)
but the score does, any ideas why?
timing window in INI
if you do an entire song in it. and save it'll crash if you do an entire song in it. and save it'll crash
re-add texture hints re-add texture hints
stepmania/src/Banner.cpp
+1 -1
View File
@@ -77,7 +77,7 @@ bool Banner::LoadFromGroup( CString sGroupName )
else if( sGroupBannerPath != "" ) else if( sGroupBannerPath != "" )
Banner::Load( sGroupBannerPath ); Banner::Load( sGroupBannerPath );
else else
Banner::Load( THEME->GetPathTo("Graphics","select music section banner") ); Banner::Load( THEME->GetPathTo("Graphics","fallback banner") );
return true; return true;
} }
stepmania/src/BitmapText.h
+1
View File
@@ -28,6 +28,7 @@ public:
bool LoadFromFont( CString sFontName ); bool LoadFromFont( CString sFontName );
bool LoadFromNumbers( CString sTexturePath ) { return LoadFromTextureAndChars(sTexturePath,"0123456789%. :x"); };
bool LoadFromTextureAndChars( CString sTexturePath, CString sChars ); bool LoadFromTextureAndChars( CString sTexturePath, CString sChars );
void SetText( CString sText ); void SetText( CString sText );
stepmania/src/Combo.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ Combo::Combo()
m_sprCombo.SetX( 40 ); m_sprCombo.SetX( 40 );
m_sprCombo.SetZoom( 1.0f ); m_sprCombo.SetZoom( 1.0f );
m_textComboNumber.LoadFromTextureAndChars( THEME->GetPathTo("Graphics","gameplay combo numbers 5x3"), "0123456789%. :x" ); m_textComboNumber.LoadFromNumbers( THEME->GetPathTo("Numbers","gameplay combo numbers") );
m_textComboNumber.TurnShadowOn(); m_textComboNumber.TurnShadowOn();
m_textComboNumber.SetHorizAlign( Actor::align_right ); m_textComboNumber.SetHorizAlign( Actor::align_right );
m_textComboNumber.SetX( 0 ); m_textComboNumber.SetX( 0 );
stepmania/src/GameManager.cpp
+1 -1
View File
@@ -1208,7 +1208,7 @@ NotesType GameManager::StringToNotesType( CString sNotesType )
return NotesType(i); return NotesType(i);
// invalid NotesType // invalid NotesType
ASSERT(0); LOG->Warn( "Invalid NotesType string '%s' encountered. Assuming this is 'dance-single'.", sNotesType );
return NOTES_TYPE_DANCE_SINGLE; return NOTES_TYPE_DANCE_SINGLE;
} }
stepmania/src/LifeMeterBattery.cpp
+2 -2
View File
@@ -53,13 +53,13 @@ void LifeMeterBattery::Load( PlayerNumber pn )
if( bPlayerEnabled ) if( bPlayerEnabled )
this->AddChild( &m_sprBattery ); this->AddChild( &m_sprBattery );
m_textNumLives.LoadFromTextureAndChars( THEME->GetPathTo("Graphics","gameplay battery life numbers 5x3"), "0123456789%. :x" ); m_textNumLives.LoadFromNumbers( THEME->GetPathTo("Numbers","gameplay battery life numbers") );
m_textNumLives.SetDiffuse( D3DXCOLOR(1,1,1,1) ); m_textNumLives.SetDiffuse( D3DXCOLOR(1,1,1,1) );
m_textNumLives.TurnShadowOff(); m_textNumLives.TurnShadowOff();
if( bPlayerEnabled ) if( bPlayerEnabled )
this->AddChild( &m_textNumLives ); this->AddChild( &m_textNumLives );
m_textPercent.LoadFromTextureAndChars( THEME->GetPathTo("Graphics","gameplay battery percent numbers 5x3"), "0123456789%. :x" ); m_textPercent.LoadFromNumbers( THEME->GetPathTo("Numbers","gameplay battery percent numbers") );
m_textPercent.TurnShadowOff(); m_textPercent.TurnShadowOff();
m_textPercent.SetZoom( 0.7f ); m_textPercent.SetZoom( 0.7f );
m_textPercent.SetText( "00.0" ); m_textPercent.SetText( "00.0" );
stepmania/src/MenuTimer.cpp
+2 -2
View File
@@ -25,12 +25,12 @@ MenuTimer::MenuTimer()
m_fStallSeconds = 0; m_fStallSeconds = 0;
m_bTimerStopped = false; m_bTimerStopped = false;
m_textDigit1.LoadFromTextureAndChars( THEME->GetPathTo("Graphics","menu timer numbers 5x3"), "0123456789%. :x" ); m_textDigit1.LoadFromNumbers( THEME->GetPathTo("Numbers","menu timer numbers") );
m_textDigit1.TurnShadowOff(); m_textDigit1.TurnShadowOff();
m_textDigit1.SetXY( -18, 0 ); m_textDigit1.SetXY( -18, 0 );
this->AddChild( &m_textDigit1 ); this->AddChild( &m_textDigit1 );
m_textDigit2.LoadFromTextureAndChars( THEME->GetPathTo("Graphics","menu timer numbers 5x3"), "0123456789%. :x" ); m_textDigit2.LoadFromNumbers( THEME->GetPathTo("Numbers","menu timer numbers") );
m_textDigit2.TurnShadowOff(); m_textDigit2.TurnShadowOff();
m_textDigit2.SetXY( +18, 0 ); m_textDigit2.SetXY( +18, 0 );
this->AddChild( &m_textDigit2 ); this->AddChild( &m_textDigit2 );
stepmania/src/MsdFile.cpp
+3 -3
View File
@@ -49,9 +49,9 @@ bool MsdFile::ReadFile( CString sNewPath )
int iBytesRead = fread( szFileString, 1, iBufferSize, fp ); int iBytesRead = fread( szFileString, 1, iBufferSize, fp );
ASSERT( iBufferSize > iBytesRead ); // why are these not always =? ASSERT( iBufferSize > iBytesRead );
/* because iBufferSize is the filesize+1000. why are we using Windows /* why are we using Windows API calls for simple file access, anyway? XXX -glenn */
* API calls for simple file access, anyway? XXX -glenn */ /* What is the C way to get the file size? I don't see 'fstat' in C library... -Chris */
m_iNumValues = 0; m_iNumValues = 0;
stepmania/src/Player.cpp
+4 -4
View File
@@ -389,9 +389,9 @@ void Player::Step( int col )
TapNoteScore &score = m_TapNoteScores[col][iIndexOverlappingNote]; TapNoteScore &score = m_TapNoteScores[col][iIndexOverlappingNote];
if( fPercentFromPerfect < 0.25f ) score = TNS_PERFECT; if( fPercentFromPerfect < PREFSMAN->m_fJudgeWindowPerfectPercent ) score = TNS_PERFECT;
else if( fPercentFromPerfect < 0.50f ) score = TNS_GREAT; else if( fPercentFromPerfect < PREFSMAN->m_fJudgeWindowGreatPercent ) score = TNS_GREAT;
else if( fPercentFromPerfect < 0.75f ) score = TNS_GOOD; else if( fPercentFromPerfect < PREFSMAN->m_fJudgeWindowGoodPercent ) score = TNS_GOOD;
else score = TNS_BOO; else score = TNS_BOO;
if( GAMESTATE->m_bDemonstration || PREFSMAN->m_bAutoPlay ) if( GAMESTATE->m_bDemonstration || PREFSMAN->m_bAutoPlay )
@@ -633,7 +633,7 @@ void Player::HandleNoteScore( HoldNoteScore score )
float Player::GetMaxBeatDifference() float Player::GetMaxBeatDifference()
{ {
return GAMESTATE->m_fCurBPS * PREFSMAN->m_fJudgeWindow * GAMESTATE->m_SongOptions.m_fMusicRate; return GAMESTATE->m_fCurBPS * PREFSMAN->m_fJudgeWindowSeconds * GAMESTATE->m_SongOptions.m_fMusicRate;
} }
void Player::FadeToFail() void Player::FadeToFail()
stepmania/src/PrefsManager.cpp
+16 -7
View File
@@ -45,7 +45,10 @@ PrefsManager::PrefsManager()
m_bEventMode = false; m_bEventMode = false;
m_iNumArcadeStages = 3; m_iNumArcadeStages = 3;
m_bAutoPlay = false; m_bAutoPlay = false;
m_fJudgeWindow = 0.18f; m_fJudgeWindowSeconds = 0.18f;
m_fJudgeWindowPerfectPercent = 0.25f;
m_fJudgeWindowGreatPercent = 0.50f;
m_fJudgeWindowGoodPercent = 0.75f;
m_fLifeDifficultyScale = 1.0f; m_fLifeDifficultyScale = 1.0f;
m_iMovieDecodeMS = 2; m_iMovieDecodeMS = 2;
m_bUseBGIfNoBanner = false; m_bUseBGIfNoBanner = false;
@@ -80,7 +83,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame )
ini.GetValueI( "Options", "TextureResolution", m_iTextureResolution ); ini.GetValueI( "Options", "TextureResolution", m_iTextureResolution );
ini.GetValueI( "Options", "RefreshRate", m_iRefreshRate ); ini.GetValueI( "Options", "RefreshRate", m_iRefreshRate );
ini.GetValueB( "Options", "IgnoreJoyAxes", m_bIgnoreJoyAxes ); ini.GetValueB( "Options", "IgnoreJoyAxes", m_bIgnoreJoyAxes );
ini.GetValueB( "Options", "UseDedicatedMenuButtons",m_bOnlyDedicatedMenuButtons ); ini.GetValueB( "Options", "UseDedicatedMenuButtons", m_bOnlyDedicatedMenuButtons );
ini.GetValueB( "Options", "ShowStats", m_bShowStats ); ini.GetValueB( "Options", "ShowStats", m_bShowStats );
ini.GetValueI( "Options", "BackgroundMode", (int&)m_BackgroundMode ); ini.GetValueI( "Options", "BackgroundMode", (int&)m_BackgroundMode );
ini.GetValueB( "Options", "ShowDanger", m_bShowDanger ); ini.GetValueB( "Options", "ShowDanger", m_bShowDanger );
@@ -89,7 +92,10 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame )
ini.GetValueB( "Options", "EventMode", m_bEventMode ); ini.GetValueB( "Options", "EventMode", m_bEventMode );
ini.GetValueI( "Options", "NumArcadeStages", m_iNumArcadeStages ); ini.GetValueI( "Options", "NumArcadeStages", m_iNumArcadeStages );
ini.GetValueB( "Options", "AutoPlay", m_bAutoPlay ); ini.GetValueB( "Options", "AutoPlay", m_bAutoPlay );
ini.GetValueF( "Options", "JudgeWindow", m_fJudgeWindow ); ini.GetValueF( "Options", "JudgeWindowSeconds", m_fJudgeWindowSeconds );
ini.GetValueF( "Options", "JudgeWindowPerfectPercent", m_fJudgeWindowPerfectPercent );
ini.GetValueF( "Options", "JudgeWindowGreatPercent", m_fJudgeWindowGreatPercent );
ini.GetValueF( "Options", "JudgeWindowGoodPercent", m_fJudgeWindowGoodPercent );
ini.GetValueF( "Options", "LifeDifficultyScale", m_fLifeDifficultyScale ); ini.GetValueF( "Options", "LifeDifficultyScale", m_fLifeDifficultyScale );
ini.GetValueI( "Options", "MovieDecodeMS", m_iMovieDecodeMS ); ini.GetValueI( "Options", "MovieDecodeMS", m_iMovieDecodeMS );
ini.GetValueB( "Options", "UseBGIfNoBanner", m_bUseBGIfNoBanner ); ini.GetValueB( "Options", "UseBGIfNoBanner", m_bUseBGIfNoBanner );
@@ -97,7 +103,7 @@ void PrefsManager::ReadGlobalPrefsFromDisk( bool bSwitchToLastPlayedGame )
ini.GetValueB( "Options", "HiddenSongs", m_bHiddenSongs ); ini.GetValueB( "Options", "HiddenSongs", m_bHiddenSongs );
ini.GetValueB( "Options", "Vsync", m_bVsync ); ini.GetValueB( "Options", "Vsync", m_bVsync );
ini.GetValueB( "Options", "HowToPlay", m_bHowToPlay ); ini.GetValueB( "Options", "HowToPlay", m_bHowToPlay );
ini.GetValueB( "Options", "ArcadeOptionsNavigation",m_bArcadeOptionsNavigation ); ini.GetValueB( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation );
ini.GetValue ( "Options", "DWIPath", m_DWIPath ); ini.GetValue ( "Options", "DWIPath", m_DWIPath );
ini.GetValueI( "Options", "UnloadTextureDelaySeconds", m_iUnloadTextureDelaySeconds ); ini.GetValueI( "Options", "UnloadTextureDelaySeconds", m_iUnloadTextureDelaySeconds );
@@ -125,7 +131,7 @@ void PrefsManager::SaveGlobalPrefsToDisk()
ini.SetValueI( "Options", "TextureResolution", m_iTextureResolution ); ini.SetValueI( "Options", "TextureResolution", m_iTextureResolution );
ini.SetValueI( "Options", "RefreshRate", m_iRefreshRate ); ini.SetValueI( "Options", "RefreshRate", m_iRefreshRate );
ini.SetValueB( "Options", "IgnoreJoyAxes", m_bIgnoreJoyAxes ); ini.SetValueB( "Options", "IgnoreJoyAxes", m_bIgnoreJoyAxes );
ini.SetValueB( "Options", "UseDedicatedMenuButtons",m_bOnlyDedicatedMenuButtons ); ini.SetValueB( "Options", "UseDedicatedMenuButtons", m_bOnlyDedicatedMenuButtons );
ini.SetValueB( "Options", "ShowStats", m_bShowStats ); ini.SetValueB( "Options", "ShowStats", m_bShowStats );
ini.SetValueI( "Options", "BackgroundMode", m_BackgroundMode); ini.SetValueI( "Options", "BackgroundMode", m_BackgroundMode);
ini.SetValueB( "Options", "ShowDanger", m_bShowDanger ); ini.SetValueB( "Options", "ShowDanger", m_bShowDanger );
@@ -134,7 +140,10 @@ void PrefsManager::SaveGlobalPrefsToDisk()
ini.SetValueB( "Options", "MenuTimer", m_bMenuTimer ); ini.SetValueB( "Options", "MenuTimer", m_bMenuTimer );
ini.SetValueI( "Options", "NumArcadeStages", m_iNumArcadeStages ); ini.SetValueI( "Options", "NumArcadeStages", m_iNumArcadeStages );
ini.SetValueB( "Options", "AutoPlay", m_bAutoPlay ); ini.SetValueB( "Options", "AutoPlay", m_bAutoPlay );
ini.SetValueF( "Options", "JudgeWindow", m_fJudgeWindow ); ini.SetValueF( "Options", "JudgeWindowSeconds", m_fJudgeWindowSeconds );
ini.SetValueF( "Options", "JudgeWindowPerfectPercent", m_fJudgeWindowPerfectPercent );
ini.SetValueF( "Options", "JudgeWindowGreatPercent", m_fJudgeWindowGreatPercent );
ini.SetValueF( "Options", "JudgeWindowGoodPercent", m_fJudgeWindowGoodPercent );
ini.SetValueF( "Options", "LifeDifficultyScale", m_fLifeDifficultyScale ); ini.SetValueF( "Options", "LifeDifficultyScale", m_fLifeDifficultyScale );
ini.SetValueI( "Options", "MovieDecodeMS", m_iMovieDecodeMS ); ini.SetValueI( "Options", "MovieDecodeMS", m_iMovieDecodeMS );
ini.SetValueB( "Options", "UseBGIfNoBanner", m_bUseBGIfNoBanner ); ini.SetValueB( "Options", "UseBGIfNoBanner", m_bUseBGIfNoBanner );
@@ -142,7 +151,7 @@ void PrefsManager::SaveGlobalPrefsToDisk()
ini.SetValueB( "Options", "HiddenSongs", m_bHiddenSongs ); ini.SetValueB( "Options", "HiddenSongs", m_bHiddenSongs );
ini.SetValueB( "Options", "Vsync", m_bVsync ); ini.SetValueB( "Options", "Vsync", m_bVsync );
ini.SetValueB( "Options", "HowToPlay", m_bHowToPlay ); ini.SetValueB( "Options", "HowToPlay", m_bHowToPlay );
ini.SetValueB( "Options", "ArcadeOptionsNavigation",m_bArcadeOptionsNavigation ); ini.SetValueB( "Options", "ArcadeOptionsNavigation", m_bArcadeOptionsNavigation );
ini.SetValue ( "Options", "DWIPath", m_DWIPath ); ini.SetValue ( "Options", "DWIPath", m_DWIPath );
ini.SetValueI( "Options", "UnloadTextureDelaySeconds", m_iUnloadTextureDelaySeconds ); ini.SetValueI( "Options", "UnloadTextureDelaySeconds", m_iUnloadTextureDelaySeconds );
stepmania/src/PrefsManager.h
+4 -1
View File
@@ -46,8 +46,11 @@ public:
bool m_bShowDanger; bool m_bShowDanger;
int m_iNumArcadeStages; int m_iNumArcadeStages;
bool m_bEventMode; bool m_bEventMode;
float m_fJudgeWindow; float m_fJudgeWindowSeconds;
float m_fLifeDifficultyScale; float m_fLifeDifficultyScale;
float m_fJudgeWindowPerfectPercent;
float m_fJudgeWindowGreatPercent;
float m_fJudgeWindowGoodPercent;
bool m_bAutoPlay; bool m_bAutoPlay;
bool m_bDelayedEscape; bool m_bDelayedEscape;
bool m_bHowToPlay; bool m_bHowToPlay;
stepmania/src/ScoreDisplayNormal.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ ScoreDisplayNormal::ScoreDisplayNormal()
LOG->Trace( "ScoreDisplayNormal::ScoreDisplayNormal()" ); LOG->Trace( "ScoreDisplayNormal::ScoreDisplayNormal()" );
// init the text // init the text
BitmapText::LoadFromTextureAndChars( THEME->GetPathTo("Graphics","gameplay score numbers 5x3"), "0123456789%. :x" ); BitmapText::LoadFromNumbers( THEME->GetPathTo("Numbers","gameplay score numbers") );
TurnShadowOff(); TurnShadowOff();
m_fScore = 0; m_fScore = 0;
stepmania/src/ScreenEvaluation.cpp
+4 -4
View File
@@ -369,7 +369,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
m_sprPercentFrame[p].SetXY( GRADE_X(p), GRADE_Y ); m_sprPercentFrame[p].SetXY( GRADE_X(p), GRADE_Y );
this->AddChild( &m_sprPercentFrame[p] ); this->AddChild( &m_sprPercentFrame[p] );
m_textOniPercentLarge[p].LoadFromTextureAndChars( THEME->GetPathTo("Graphics","evaluation percent numbers 5x3"),"0123456789%. :x" ); m_textOniPercentLarge[p].LoadFromNumbers( THEME->GetPathTo("Numbers","evaluation percent numbers") );
m_textOniPercentLarge[p].TurnShadowOff(); m_textOniPercentLarge[p].TurnShadowOff();
m_textOniPercentLarge[p].SetXY( PERCENT_BASE_X(p), PERCENT_BASE_Y ); m_textOniPercentLarge[p].SetXY( PERCENT_BASE_X(p), PERCENT_BASE_Y );
m_textOniPercentLarge[p].SetHorizAlign( Actor::align_right ); m_textOniPercentLarge[p].SetHorizAlign( Actor::align_right );
@@ -377,7 +377,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
m_textOniPercentLarge[p].SetEffectGlowing( 1.0f ); m_textOniPercentLarge[p].SetEffectGlowing( 1.0f );
this->AddChild( &m_textOniPercentLarge[p] ); this->AddChild( &m_textOniPercentLarge[p] );
m_textOniPercentSmall[p].LoadFromTextureAndChars( THEME->GetPathTo("Graphics","evaluation percent numbers 5x3"),"0123456789%. :x" ); m_textOniPercentSmall[p].LoadFromNumbers( THEME->GetPathTo("Numbers","evaluation percent numbers") );
m_textOniPercentSmall[p].TurnShadowOff(); m_textOniPercentSmall[p].TurnShadowOff();
m_textOniPercentSmall[p].SetZoom( 0.5f ); m_textOniPercentSmall[p].SetZoom( 0.5f );
m_textOniPercentSmall[p].SetXY( PERCENT_BASE_X(p), PERCENT_BASE_Y ); m_textOniPercentSmall[p].SetXY( PERCENT_BASE_X(p), PERCENT_BASE_Y );
@@ -401,7 +401,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
m_sprCourseFrame[p].SetXY( BONUS_X(p), BONUS_Y ); m_sprCourseFrame[p].SetXY( BONUS_X(p), BONUS_Y );
this->AddChild( &m_sprCourseFrame[p] ); this->AddChild( &m_sprCourseFrame[p] );
m_textSongsSurvived[p].LoadFromTextureAndChars( THEME->GetPathTo("Graphics","evaluation stage numbers 5x3"),"0123456789%. :x"); m_textSongsSurvived[p].LoadFromNumbers( THEME->GetPathTo("Numbers","evaluation stage numbers") );
m_textSongsSurvived[p].TurnShadowOff(); m_textSongsSurvived[p].TurnShadowOff();
m_textSongsSurvived[p].SetXY( SONGS_SURVIVED_X(p), SONGS_SURVIVED_Y ); m_textSongsSurvived[p].SetXY( SONGS_SURVIVED_X(p), SONGS_SURVIVED_Y );
m_textSongsSurvived[p].SetText( ssprintf("%02d", GAMESTATE->m_iSongsBeforeFail[p]) ); m_textSongsSurvived[p].SetText( ssprintf("%02d", GAMESTATE->m_iSongsBeforeFail[p]) );
@@ -511,7 +511,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
for( l=0; l<NUM_JUDGE_LINES; l++ ) for( l=0; l<NUM_JUDGE_LINES; l++ )
{ {
m_textJudgeNumbers[l][p].LoadFromTextureAndChars( THEME->GetPathTo("Graphics","evaluation score numbers 5x3"), "0123456789%. :x" ); m_textJudgeNumbers[l][p].LoadFromNumbers( THEME->GetPathTo("Numbers","evaluation score numbers") );
m_textJudgeNumbers[l][p].TurnShadowOff(); m_textJudgeNumbers[l][p].TurnShadowOff();
m_textJudgeNumbers[l][p].SetXY( JUDGE_X(m_ResultMode==RM_ONI,p,l), JUDGE_Y(l) ); m_textJudgeNumbers[l][p].SetXY( JUDGE_X(m_ResultMode==RM_ONI,p,l), JUDGE_Y(l) );
m_textJudgeNumbers[l][p].SetZoom( 0.7f ); m_textJudgeNumbers[l][p].SetZoom( 0.7f );
stepmania/src/ScreenMachineOptions.cpp
+18 -18
View File
@@ -88,15 +88,15 @@ void ScreenMachineOptions::ImportOptions()
* impossible, and perhaps it *is* justice that even the CPU fails * impossible, and perhaps it *is* justice that even the CPU fails
* it. :) * it. :)
*/ */
if( PREFSMAN->m_fJudgeWindow == 0.24f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 0; if( PREFSMAN->m_fJudgeWindowSeconds == 0.24f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 0;
else if( PREFSMAN->m_fJudgeWindow == 0.22f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 1; else if( PREFSMAN->m_fJudgeWindowSeconds == 0.22f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 1;
else if( PREFSMAN->m_fJudgeWindow == 0.20f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 2; else if( PREFSMAN->m_fJudgeWindowSeconds == 0.20f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 2;
else if( PREFSMAN->m_fJudgeWindow == 0.18f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 3; else if( PREFSMAN->m_fJudgeWindowSeconds == 0.18f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 3;
else if( PREFSMAN->m_fJudgeWindow == 0.16f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 4; else if( PREFSMAN->m_fJudgeWindowSeconds == 0.16f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 4;
else if( PREFSMAN->m_fJudgeWindow == 0.14f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 5; else if( PREFSMAN->m_fJudgeWindowSeconds == 0.14f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 5;
else if( PREFSMAN->m_fJudgeWindow == 0.12f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 6; else if( PREFSMAN->m_fJudgeWindowSeconds == 0.12f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 6;
else if( PREFSMAN->m_fJudgeWindow == 0.06f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 7; else if( PREFSMAN->m_fJudgeWindowSeconds == 0.06f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 7;
// else if( PREFSMAN->m_fJudgeWindow == 0.02f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 8; // else if( PREFSMAN->m_fJudgeWindowSeconds == 0.02f ) m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 8;
else m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 3; else m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] = 3;
if( PREFSMAN->m_fLifeDifficultyScale == 1.60f ) m_iSelectedOption[0][MO_LIFE_DIFFICULTY] = 0; if( PREFSMAN->m_fLifeDifficultyScale == 1.60f ) m_iSelectedOption[0][MO_LIFE_DIFFICULTY] = 0;
@@ -121,15 +121,15 @@ void ScreenMachineOptions::ExportOptions()
switch( m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] ) switch( m_iSelectedOption[0][MO_JUDGE_DIFFICULTY] )
{ {
case 0: PREFSMAN->m_fJudgeWindow = 0.24f; break; case 0: PREFSMAN->m_fJudgeWindowSeconds = 0.24f; break;
case 1: PREFSMAN->m_fJudgeWindow = 0.22f; break; case 1: PREFSMAN->m_fJudgeWindowSeconds = 0.22f; break;
case 2: PREFSMAN->m_fJudgeWindow = 0.20f; break; case 2: PREFSMAN->m_fJudgeWindowSeconds = 0.20f; break;
case 3: PREFSMAN->m_fJudgeWindow = 0.18f; break; case 3: PREFSMAN->m_fJudgeWindowSeconds = 0.18f; break;
case 4: PREFSMAN->m_fJudgeWindow = 0.16f; break; case 4: PREFSMAN->m_fJudgeWindowSeconds = 0.16f; break;
case 5: PREFSMAN->m_fJudgeWindow = 0.14f; break; case 5: PREFSMAN->m_fJudgeWindowSeconds = 0.14f; break;
case 6: PREFSMAN->m_fJudgeWindow = 0.12f; break; case 6: PREFSMAN->m_fJudgeWindowSeconds = 0.12f; break;
case 7: PREFSMAN->m_fJudgeWindow = 0.06f; break; case 7: PREFSMAN->m_fJudgeWindowSeconds = 0.06f; break;
// case 8: PREFSMAN->m_fJudgeWindow = 0.02f; break; // case 8: PREFSMAN->m_fJudgeWindowSeconds = 0.02f; break;
default: ASSERT(0); default: ASSERT(0);
} }
stepmania/src/ScreenSelectCourse.cpp
+15 -16
View File
@@ -118,13 +118,12 @@ ScreenSelectCourse::ScreenSelectCourse()
this->AddChild( &m_HighScore[p] ); this->AddChild( &m_HighScore[p] );
} }
m_textHoldForOptions.LoadFromFont( THEME->GetPathTo("Fonts","select music hold") ); m_sprOptionsMessage.Load( THEME->GetPathTo("Graphics","select music options message 1x2") );
m_textHoldForOptions.SetXY( CENTER_X, CENTER_Y ); m_sprOptionsMessage.StopAnimating();
m_textHoldForOptions.SetText( "press START again for options" ); m_sprOptionsMessage.SetXY( CENTER_X, CENTER_Y );
m_textHoldForOptions.SetZoom( 1 ); m_sprOptionsMessage.SetZoomY( 0 );
m_textHoldForOptions.SetZoomY( 0 ); m_sprOptionsMessage.SetDiffuse( D3DXCOLOR(1,1,1,0) );
m_textHoldForOptions.SetDiffuse( D3DXCOLOR(1,1,1,0) ); this->AddChild( &m_sprOptionsMessage );
this->AddChild( &m_textHoldForOptions );
m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") );
@@ -201,7 +200,7 @@ void ScreenSelectCourse::Input( const DeviceInput& DeviceI, const InputEventType
if( m_bMadeChoice && !m_bGoToOptions && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START && !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() ) if( m_bMadeChoice && !m_bGoToOptions && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START && !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() )
{ {
m_bGoToOptions = true; m_bGoToOptions = true;
m_textHoldForOptions.SetText( "Entering Options..." ); m_sprOptionsMessage.SetState( 1 );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") );
return; return;
} }
@@ -286,14 +285,14 @@ void ScreenSelectCourse::MenuStart( PlayerNumber pn )
m_bMadeChoice = true; m_bMadeChoice = true;
// show "hold START for options" // show "hold START for options"
m_textHoldForOptions.SetDiffuse( D3DXCOLOR(1,1,1,0) ); m_sprOptionsMessage.SetDiffuse( D3DXCOLOR(1,1,1,0) );
m_textHoldForOptions.BeginTweening( 0.25f ); // fade in m_sprOptionsMessage.BeginTweening( 0.25f ); // fade in
m_textHoldForOptions.SetTweenZoomY( 1 ); m_sprOptionsMessage.SetTweenZoomY( 1 );
m_textHoldForOptions.SetTweenDiffuse( D3DXCOLOR(1,1,1,1) ); m_sprOptionsMessage.SetTweenDiffuse( D3DXCOLOR(1,1,1,1) );
m_textHoldForOptions.BeginTweening( 2.0f ); // sleep m_sprOptionsMessage.BeginTweening( 2.0f ); // sleep
m_textHoldForOptions.BeginTweening( 0.25f ); // fade out m_sprOptionsMessage.BeginTweening( 0.25f ); // fade out
m_textHoldForOptions.SetTweenDiffuse( D3DXCOLOR(1,1,1,0) ); m_sprOptionsMessage.SetTweenDiffuse( D3DXCOLOR(1,1,1,0) );
m_textHoldForOptions.SetTweenZoomY( 0 ); m_sprOptionsMessage.SetTweenZoomY( 0 );
m_Menu.TweenOffScreenToBlack( SM_None, false ); m_Menu.TweenOffScreenToBlack( SM_None, false );
stepmania/src/ScreenSelectCourse.h
+1 -1
View File
@@ -60,7 +60,7 @@ protected:
bool m_bMadeChoice; bool m_bMadeChoice;
bool m_bGoToOptions; bool m_bGoToOptions;
BitmapText m_textHoldForOptions; Sprite m_sprOptionsMessage;
RageSoundSample m_soundSelect; RageSoundSample m_soundSelect;
RageSoundSample m_soundOptionsChange; RageSoundSample m_soundOptionsChange;
stepmania/src/ScreenSelectMusic.cpp
+15 -17
View File
@@ -214,14 +214,12 @@ ScreenSelectMusic::ScreenSelectMusic()
this->AddChild( &m_MusicSortDisplay ); this->AddChild( &m_MusicSortDisplay );
m_textHoldForOptions.LoadFromFont( THEME->GetPathTo("Fonts","select music hold") ); m_sprOptionsMessage.Load( THEME->GetPathTo("Graphics","select music options message") );
m_textHoldForOptions.SetXY( CENTER_X, CENTER_Y ); m_sprOptionsMessage.StopAnimating();
m_textHoldForOptions.SetText( "press START again for options" ); m_sprOptionsMessage.SetXY( CENTER_X, CENTER_Y );
m_textHoldForOptions.SetZoom( 1 ); m_sprOptionsMessage.SetZoom( 1 );
m_textHoldForOptions.SetZoomY( 0 ); m_sprOptionsMessage.SetDiffuse( D3DXCOLOR(1,1,1,0) );
m_textHoldForOptions.SetDiffuse( D3DXCOLOR(1,1,1,0) ); this->AddChild( &m_sprOptionsMessage );
m_textHoldForOptions.SetZ( -2 );
this->AddChild( &m_textHoldForOptions );
m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") ); m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") );
@@ -399,7 +397,7 @@ void ScreenSelectMusic::Input( const DeviceInput& DeviceI, const InputEventType
if( m_bMadeChoice && !m_bGoToOptions && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START && !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() ) if( m_bMadeChoice && !m_bGoToOptions && MenuI.IsValid() && MenuI.button == MENU_BUTTON_START && !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() )
{ {
m_bGoToOptions = true; m_bGoToOptions = true;
m_textHoldForOptions.SetText( "Entering Options..." ); m_sprOptionsMessage.SetState( 1 );
SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") ); SOUND->PlayOnceStreamed( THEME->GetPathTo("Sounds","menu start") );
return; return;
} }
@@ -639,14 +637,14 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
if( !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() ) if( !GAMESTATE->IsExtraStage() && !GAMESTATE->IsExtraStage2() )
{ {
// show "hold START for options" // show "hold START for options"
m_textHoldForOptions.SetDiffuse( D3DXCOLOR(1,1,1,0) ); m_sprOptionsMessage.SetDiffuse( D3DXCOLOR(1,1,1,0) );
m_textHoldForOptions.BeginTweening( 0.25f ); // fade in m_sprOptionsMessage.BeginTweening( 0.25f ); // fade in
m_textHoldForOptions.SetTweenZoomY( 1 ); m_sprOptionsMessage.SetTweenZoomY( 1 );
m_textHoldForOptions.SetTweenDiffuse( D3DXCOLOR(1,1,1,1) ); m_sprOptionsMessage.SetTweenDiffuse( D3DXCOLOR(1,1,1,1) );
m_textHoldForOptions.BeginTweening( 2.0f ); // sleep m_sprOptionsMessage.BeginTweening( 2.0f ); // sleep
m_textHoldForOptions.BeginTweening( 0.25f ); // fade out m_sprOptionsMessage.BeginTweening( 0.25f ); // fade out
m_textHoldForOptions.SetTweenDiffuse( D3DXCOLOR(1,1,1,0) ); m_sprOptionsMessage.SetTweenDiffuse( D3DXCOLOR(1,1,1,0) );
m_textHoldForOptions.SetTweenZoomY( 0 ); m_sprOptionsMessage.SetTweenZoomY( 0 );
} }
m_Menu.TweenOffScreenToBlack( SM_None, false ); m_Menu.TweenOffScreenToBlack( SM_None, false );
stepmania/src/ScreenSelectMusic.h
+1 -1
View File
@@ -82,7 +82,7 @@ protected:
bool m_bMadeChoice; bool m_bMadeChoice;
bool m_bGoToOptions; bool m_bGoToOptions;
BitmapText m_textHoldForOptions; Sprite m_sprOptionsMessage;
RageSoundSample m_soundSelect; RageSoundSample m_soundSelect;
RageSoundSample m_soundChangeNotes; RageSoundSample m_soundChangeNotes;
stepmania/src/ScreenStage.cpp
+1 -1
View File
@@ -105,7 +105,7 @@ ScreenStage::ScreenStage()
for( int i=0; i<4; i++ ) for( int i=0; i<4; i++ )
{ {
m_sprNumbers[i].Load( THEME->GetPathTo("Graphics","stage numbers") ); m_sprNumbers[i].Load( THEME->GetPathTo("Graphics","stage parts 5x3") );
if( g_StageType != STAGE_TYPE_EZ2 ) // DONT DIFFUSE COLORS FOR EZ2. Coz we actually set the color in the .png if( g_StageType != STAGE_TYPE_EZ2 ) // DONT DIFFUSE COLORS FOR EZ2. Coz we actually set the color in the .png
m_sprNumbers[i].SetDiffuse( GAMESTATE->GetStageColor() ); m_sprNumbers[i].SetDiffuse( GAMESTATE->GetStageColor() );
stepmania/src/ThemeManager.cpp
+2
View File
@@ -144,10 +144,12 @@ try_element_again:
}; };
static const char *sound_masks[] = { ".set", ".mp3", ".ogg", ".wav", ".redir", NULL }; static const char *sound_masks[] = { ".set", ".mp3", ".ogg", ".wav", ".redir", NULL };
static const char *font_masks[] = { " 16x16.png", ".redir", NULL }; static const char *font_masks[] = { " 16x16.png", ".redir", NULL };
static const char *numbers_masks[] = { " 5x3.png", ".redir", NULL };
const char **asset_masks = NULL; const char **asset_masks = NULL;
if( sAssetCategory == "graphics" ) asset_masks = graphic_masks; if( sAssetCategory == "graphics" ) asset_masks = graphic_masks;
else if( sAssetCategory == "sounds" ) asset_masks = sound_masks; else if( sAssetCategory == "sounds" ) asset_masks = sound_masks;
else if( sAssetCategory == "fonts" ) asset_masks = font_masks; else if( sAssetCategory == "fonts" ) asset_masks = font_masks;
else if( sAssetCategory == "numbers" ) asset_masks = numbers_masks;
else ASSERT(0); // Unknown theme asset category else ASSERT(0); // Unknown theme asset category
int i; int i;
for(i = 0; asset_masks[i]; ++i) for(i = 0; asset_masks[i]; ++i)