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

clean up Fonts and Numbers names

Browse Source
This commit is contained in:
Chris Danford
2003-03-30 18:12:57 +00:00
parent 4d7fd44f8a
commit 214c2b67af
68 changed files with 1090 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ActiveItemList.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ ActiveItemList::ActiveItemList()
for( int i=0; i<MAX_ACTIVE_ITEMS_LINES; i++ )
{
m_text[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_text[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_text[i].SetZoom( TEXT_ZOOM );
// m_text[i].SetText( "WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW" );
this->AddChild( &m_text[i] );
stepmania/src/BPMDisplay.cpp
+2 -2
View File
@@ -29,7 +29,7 @@ BPMDisplay::BPMDisplay()
m_fTimeLeftInState = 0;
m_bExtraStage = GAMESTATE->IsExtraStage() || GAMESTATE->IsExtraStage2();
m_textBPM.LoadFromNumbers( THEME->GetPathTo("Numbers","BPMDisplay numbers") );
m_textBPM.LoadFromNumbers( THEME->GetPathTo("Numbers","BPMDisplay") );
m_textBPM.EnableShadow( false );
m_textBPM.SetHorizAlign( Actor::align_right );
m_textBPM.SetDiffuse( NORMAL_COLOR );
@@ -56,7 +56,7 @@ void BPMDisplay::Update( float fDeltaTime )
if( m_fTimeLeftInState < 0 )
{
// XXX: the numbers font doesn't have "?".
m_textBPM.SetText( (RandomFloat(0,1)>0.90) ? "%%%" : ssprintf("%03.0f",RandomFloat(0,600)) );
m_textBPM.SetText( (RandomFloat(0,1)>0.90) ? "xxx" : ssprintf("%03.0f",RandomFloat(0,600)) );
m_fTimeLeftInState = 0.2f; // reset timer
}
}
stepmania/src/Combo.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ Combo::Combo()
m_sprCombo.SetDiffuse( RageColor(1,1,1,0) ); // invisible
this->AddChild( &m_sprCombo );
m_textComboNumber.LoadFromNumbers( THEME->GetPathTo("Numbers","Combo numbers") );
m_textComboNumber.LoadFromNumbers( THEME->GetPathTo("Numbers","Combo") );
m_textComboNumber.EnableShadow( true );
m_textComboNumber.SetXY( NUMBER_X, NUMBER_Y );
m_textComboNumber.SetHorizAlign( (Actor::HorizAlign)(int)NUMBER_HORIZ_ALIGN );
stepmania/src/CourseEntryDisplay.cpp
+2 -2
View File
@@ -62,13 +62,13 @@ CourseEntryDisplay::CourseEntryDisplay()
m_textFoot.EnableShadow( false );
this->AddChild( &m_textFoot );
m_textDifficultyNumber.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textDifficultyNumber.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textDifficultyNumber.SetXY( DIFFICULTY_X, DIFFICULTY_Y );
m_textDifficultyNumber.SetZoom( DIFFICULTY_ZOOM );
m_textDifficultyNumber.EnableShadow( false );
this->AddChild( &m_textDifficultyNumber );
m_textModifiers.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textModifiers.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textModifiers.SetXY( MODIFIERS_X, MODIFIERS_Y );
m_textModifiers.SetZoom( MODIFIERS_ZOOM );
m_textModifiers.SetHorizAlign( (Actor::HorizAlign)MODIFIERS_HORIZ_ALIGN );
stepmania/src/EditMenu.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ EditMenu::EditMenu()
m_textLabel[i].SetHorizAlign( Actor::align_left );
this->AddChild( &m_textLabel[i] );
m_textValue[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textValue[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textValue[i].SetXY( ROW_VALUE_X(i), ROW_Y(i) );
m_textValue[i].SetText( "blah" );
m_textValue[i].SetZoom( 0.8f );
stepmania/src/Font.cpp
+1 -1
View File
@@ -775,7 +775,7 @@ void Font::Load(const CString &sFontOrTextureFilePath, CString sChars)
/* If this is a top-level font (not a subfont), load the default font first. */
CStringArray ImportList;
if(LoadStack.size() == 1)
ImportList.push_back("default font");
ImportList.push_back("Common default");
/* Check to see if we need to import any other fonts. Do this
* before loading this font, so any characters in this font
stepmania/src/JukeboxMenu.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ JukeboxMenu::JukeboxMenu()
m_textLabel[i].SetHorizAlign( Actor::align_left );
this->AddChild( &m_textLabel[i] );
m_textValue[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textValue[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textValue[i].SetXY( ROW_VALUE_X(i), ROW_Y(i) );
m_textValue[i].SetText( "blah" );
m_textValue[i].SetZoom( 0.8f );
stepmania/src/LifeMeterBattery.cpp
+2 -2
View File
@@ -57,13 +57,13 @@ void LifeMeterBattery::Load( PlayerNumber pn )
if( bPlayerEnabled )
this->AddChild( &m_sprBattery );
m_textNumLives.LoadFromNumbers( THEME->GetPathTo("Numbers","LifeMeterBattery life numbers") );
m_textNumLives.LoadFromNumbers( THEME->GetPathTo("Numbers","LifeMeterBattery lives") );
m_textNumLives.SetDiffuse( RageColor(1,1,1,1) );
m_textNumLives.EnableShadow( false );
if( bPlayerEnabled )
this->AddChild( &m_textNumLives );
m_textPercent.LoadFromNumbers( THEME->GetPathTo("Numbers","LifeMeterBattery percent numbers") );
m_textPercent.LoadFromNumbers( THEME->GetPathTo("Numbers","LifeMeterBattery percent") );
m_textPercent.EnableShadow( false );
m_textPercent.SetZoom( 0.7f );
if(PREFSMAN->m_bDancePointsForOni)
stepmania/src/LyricDisplay.cpp
+1 -1
View File
@@ -11,7 +11,7 @@ float g_TweenInTime, g_TweenOutTime;
LyricDisplay::LyricDisplay()
{
m_textLyrics.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textLyrics.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textLyrics.SetDiffuse( RageColor(1,1,1,1) );
this->AddChild(&m_textLyrics);
stepmania/src/MenuElements.h
+2 -2
View File
@@ -17,7 +17,7 @@
#include "Sprite.h"
#include "MenuTimer.h"
#include "TransitionBGAnimation.h"
#include "TipDisplay.h"
#include "HelpDisplay.h"
#include "BGAnimation.h"
@@ -51,7 +51,7 @@ public: // let owner tinker with these objects
Sprite m_sprStyleIcon;
MenuTimer m_MenuTimer;
Sprite m_sprFooter;
TipDisplay m_textHelp;
HelpDisplay m_textHelp;
TransitionBGAnimation m_In;
TransitionBGAnimation m_Out;
stepmania/src/MenuTimer.cpp
+2 -2
View File
@@ -27,8 +27,8 @@ MenuTimer::MenuTimer()
m_fStallSeconds = 0;
m_bPaused = false;
m_textDigit1.LoadFromNumbers( THEME->GetPathTo("Numbers","MenuTimer numbers") );
m_textDigit2.LoadFromNumbers( THEME->GetPathTo("Numbers","MenuTimer numbers") );
m_textDigit1.LoadFromNumbers( THEME->GetPathTo("Numbers","MenuTimer") );
m_textDigit2.LoadFromNumbers( THEME->GetPathTo("Numbers","MenuTimer") );
m_textDigit1.EnableShadow( false );
m_textDigit2.EnableShadow( false );
stepmania/src/NoteField.cpp
+1 -1
View File
@@ -32,7 +32,7 @@ const float ROWS_BETWEEN_HOLD_BITS = 1 / HOLD_NOTE_BITS_PER_ROW;
NoteField::NoteField()
{
m_textMeasureNumber.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textMeasureNumber.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textMeasureNumber.SetZoom( 1.0f );
m_rectMarkerBar.EnableShadow( false );
stepmania/src/ScoreDisplayNormal.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ ScoreDisplayNormal::ScoreDisplayNormal()
LOG->Trace( "ScoreDisplayNormal::ScoreDisplayNormal()" );
// init the text
m_text.LoadFromNumbers( THEME->GetPathTo("Numbers","ScoreDisplayNormal numbers") );
m_text.LoadFromNumbers( THEME->GetPathTo("Numbers","ScoreDisplayNormal") );
m_text.EnableShadow( false );
m_fScore = 0;
stepmania/src/ScoreDisplayOni.cpp
+1 -1
View File
@@ -24,7 +24,7 @@ ScoreDisplayOni::ScoreDisplayOni()
LOG->Trace( "ScoreDisplayOni::ScoreDisplayOni()" );
// init the text
m_text.LoadFromNumbers( THEME->GetPathTo("Numbers","ScoreDisplayOni numbers") );
m_text.LoadFromNumbers( THEME->GetPathTo("Numbers","ScoreDisplayOni") );
m_text.EnableShadow( false );
this->AddChild( &m_text );
}
stepmania/src/ScreenEdit.cpp
+2 -2
View File
@@ -276,7 +276,7 @@ ScreenEdit::ScreenEdit()
m_sprHelp.SetHorizAlign( Actor::align_left );
m_sprHelp.SetXY( HELP_X, HELP_Y );
m_textHelp.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textHelp.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textHelp.SetXY( HELP_TEXT_X, HELP_TEXT_Y );
m_textHelp.SetHorizAlign( Actor::align_left );
m_textHelp.SetVertAlign( Actor::align_top );
@@ -287,7 +287,7 @@ ScreenEdit::ScreenEdit()
m_sprInfo.SetHorizAlign( Actor::align_right );
m_sprInfo.SetXY( INFO_X, INFO_Y );
m_textInfo.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textInfo.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textInfo.SetXY( INFO_TEXT_X, INFO_TEXT_Y );
m_textInfo.SetHorizAlign( Actor::align_left );
m_textInfo.SetVertAlign( Actor::align_top );
stepmania/src/ScreenEditMenu.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ ScreenEditMenu::ScreenEditMenu()
this->AddChild( &m_Menu );
m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textExplanation.SetXY( EXPLANATION_X, EXPLANATION_Y );
m_textExplanation.SetText( EXPLANATION_TEXT );
m_textExplanation.SetZoom( 0.7f );
stepmania/src/ScreenEvaluation.cpp
+9 -9
View File
@@ -278,7 +278,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
m_DifficultyIcon[p].Command( DIFFICULTY_ICON_ON_COMMAND(p) );
this->AddChild( &m_DifficultyIcon[p] );
m_textPlayerOptions[p].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textPlayerOptions[p].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
CString sPO = GAMESTATE->m_PlayerOptions[p].GetString();
sPO.Replace( ", ", "\n" );
m_textPlayerOptions[p].Command( PLAYER_OPTIONS_ON_COMMAND(p) );
@@ -359,12 +359,12 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
if( !PREFSMAN->m_bDancePointsForOni )
{
m_textPercentWhole[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation percent numbers") );
m_textPercentWhole[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation percent") );
m_textPercentWhole[p].EnableShadow( false );
m_textPercentWhole[p].Command( PERCENT_WHOLE_ON_COMMAND(p) );
this->AddChild( &m_textPercentWhole[p] );
m_textPercentRemainder[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation percent numbers") );
m_textPercentRemainder[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation percent") );
m_textPercentRemainder[p].EnableShadow( false );
m_textPercentRemainder[p].Command( PERCENT_REMAINDER_ON_COMMAND(p) );
this->AddChild( &m_textPercentRemainder[p] );
@@ -379,7 +379,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
}
else // PREFSMAN->m_bDancePointsForOni
{
m_textDancePoints[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation percent numbers") );
m_textDancePoints[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation percent") );
m_textDancePoints[p].EnableShadow( false );
m_textDancePoints[p].SetText( ssprintf("%d", stageStats.iActualDancePoints[p]) );
m_textDancePoints[p].Command( DANCE_POINTS_ON_COMMAND(p) );
@@ -441,7 +441,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
m_sprSurvivedFrame[p].Command( SURVIVED_FRAME_ON_COMMAND(p) );
this->AddChild( &m_sprSurvivedFrame[p] );
m_textSurvivedNumber[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation stage numbers") );
m_textSurvivedNumber[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation stage") );
m_textSurvivedNumber[p].EnableShadow( false );
m_textSurvivedNumber[p].SetText( ssprintf("%02d", stageStats.iSongsPlayed[p]) );
m_textSurvivedNumber[p].Command( SURVIVED_NUMBER_ON_COMMAND(p) );
@@ -468,7 +468,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
if( !GAMESTATE->IsPlayerEnabled( (PlayerNumber)p ) )
continue; // skip
m_textJudgeNumbers[l][p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation judge numbers") );
m_textJudgeNumbers[l][p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation judge") );
m_textJudgeNumbers[l][p].EnableShadow( false );
m_textJudgeNumbers[l][p].SetDiffuse( PlayerToColor(p) );
m_textJudgeNumbers[l][p].Command( JUDGE_NUMBER_ON_COMMAND(l,p) );
@@ -512,7 +512,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
if( !GAMESTATE->IsPlayerEnabled( (PlayerNumber)p ) )
continue; // skip
m_textScore[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation score numbers") );
m_textScore[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation score") );
m_textScore[p].EnableShadow( false );
m_textScore[p].SetDiffuse( PlayerToColor(p) );
m_textScore[p].Command( SCORE_NUMBER_ON_COMMAND(p) );
@@ -539,7 +539,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
if( !GAMESTATE->IsPlayerEnabled( (PlayerNumber)p ) )
continue; // skip
m_textTime[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation score numbers") );
m_textTime[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenEvaluation score") );
m_textTime[p].EnableShadow( false );
m_textTime[p].SetDiffuse( PlayerToColor(p) );
m_textTime[p].Command( TIME_NUMBER_ON_COMMAND(p) );
@@ -569,7 +569,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName, Type type )
if( m_bTryExtraStage )
{
m_sprTryExtraStage.Load( THEME->GetPathTo("Graphics",GAMESTATE->IsExtraStage()?" try extra2":" try extra1") );
m_sprTryExtraStage.Load( THEME->GetPathTo("Graphics",GAMESTATE->IsExtraStage()?"ScreenEvaluation try extra2":"ScreenEvaluation try extra1") );
m_sprTryExtraStage.Command( TRY_EXTRA_STAGE_ON_COMMAND );
this->AddChild( &m_sprTryExtraStage );
stepmania/src/ScreenEz2SelectMusic.cpp
+1 -1
View File
@@ -135,7 +135,7 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic()
m_PumpDifficultyCircle.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y );
this->AddChild( &m_PumpDifficultyCircle );
m_PumpDifficultyRating.LoadFromFont( THEME->GetPathTo("Fonts","pump songselect difficulty") );
m_PumpDifficultyRating.LoadFromFont( THEME->GetPathTo("Fonts","ScreenEz2SelectMusic difficulty") );
m_PumpDifficultyRating.SetXY( PUMP_DIFF_X, PUMP_DIFF_Y );
this->AddChild(&m_PumpDifficultyRating);
stepmania/src/ScreenEz2SelectMusic.h
+1 -1
View File
@@ -15,7 +15,7 @@
#include "Sprite.h"
#include "BitmapText.h"
#include "MenuElements.h"
#include "TipDisplay.h"
#include "HelpDisplay.h"
#include "MusicBannerWheel.h"
#include "MenuElements.h"
#include "DifficultyMeter.h"
stepmania/src/ScreenGameplay.cpp
+14 -14
View File
@@ -277,7 +277,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
for( p=0; p<NUM_PLAYERS; p++ )
{
m_textCourseSongNumber[p].LoadFromFont( THEME->GetPathTo("Fonts","Header2") );
m_textCourseSongNumber[p].LoadFromFont( THEME->GetPathTo("Numbers","ScreenGameplay song num") );
m_textCourseSongNumber[p].EnableShadow( false );
m_textCourseSongNumber[p].SetXY( SONG_NUMBER_X(p), SONG_NUMBER_Y(p,bExtra) );
m_textCourseSongNumber[p].SetText( "" );
@@ -316,13 +316,13 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
m_sprScoreFrame.SetXY( SCORE_FRAME_X, SCORE_FRAME_Y(bExtra) );
this->AddChild( &m_sprScoreFrame );
m_StageName.LoadFromFont( THEME->GetPathTo("Fonts","musicwheel text banner") );
m_StageName.EnableShadow( false );
m_StageName.SetXY( STAGENAME_X, STAGENAME_Y );
m_StageName.SetZoom( STAGENAME_ZOOM );
this->AddChild( &m_StageName );
m_textSongTitle.LoadFromFont( THEME->GetPathTo("Fonts","ScreenGameplay song title") );
m_textSongTitle.EnableShadow( false );
m_textSongTitle.SetXY( STAGENAME_X, STAGENAME_Y );
m_textSongTitle.SetZoom( STAGENAME_ZOOM );
this->AddChild( &m_textSongTitle );
m_MaxCombo.LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenGameplay max combo numbers") );
m_MaxCombo.LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenGameplay max combo") );
m_MaxCombo.SetXY( MAXCOMBO_X, MAXCOMBO_Y );
m_MaxCombo.SetZoom( MAXCOMBO_ZOOM );
m_MaxCombo.SetText( ssprintf("%d", GAMESTATE->m_CurStageStats.iCurCombo[GAMESTATE->m_MasterPlayerNumber]) ); /* TODO: Make this work for both players */
@@ -355,7 +355,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
m_pScoreDisplay[p]->SetZoom( SCORE_ZOOM );
this->AddChild( m_pScoreDisplay[p] );
m_textPlayerOptions[p].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textPlayerOptions[p].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textPlayerOptions[p].EnableShadow( false );
m_textPlayerOptions[p].SetXY( PLAYER_OPTIONS_X(p), PLAYER_OPTIONS_Y(p,bExtra) );
m_textPlayerOptions[p].SetZoom( 0.5f );
@@ -363,7 +363,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
this->AddChild( &m_textPlayerOptions[p] );
}
m_textSongOptions.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textSongOptions.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textSongOptions.EnableShadow( false );
m_textSongOptions.SetXY( SONG_OPTIONS_X, SONG_OPTIONS_Y(bExtra) );
m_textSongOptions.SetZoom( 0.5f );
@@ -387,7 +387,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
this->AddChild(&m_LyricDisplay);
m_textAutoPlay.LoadFromFont( THEME->GetPathTo("Fonts","header2") );
m_textAutoPlay.LoadFromFont( THEME->GetPathTo("Fonts","ScreenGameplay autoplay") );
m_textAutoPlay.SetXY( AUTOPLAY_X, AUTOPLAY_Y );
if( !bDemonstration ) // only load if we're not in demonstration of jukebox
this->AddChild( &m_textAutoPlay );
@@ -429,7 +429,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
this->AddChild( &m_In );
m_textDebug.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textDebug.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textDebug.SetXY( DEBUG_X, DEBUG_Y );
m_textDebug.SetDiffuse( RageColor(1,1,1,1) );
this->AddChild( &m_textDebug );
@@ -441,7 +441,7 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
if( GAMESTATE->IsExtraStage() ) // only load if we're going to use it
{
m_textSurviveTime.LoadFromFont( THEME->GetPathTo("Fonts","survive time") );
m_textSurviveTime.LoadFromFont( THEME->GetPathTo("Fonts","ScreenGameplay survive time") );
m_textSurviveTime.EnableShadow( false );
m_textSurviveTime.SetXY( SURVIVE_TIME_X, SURVIVE_TIME_Y );
m_textSurviveTime.SetText( "" );
@@ -579,7 +579,7 @@ void ScreenGameplay::LoadNextSong()
m_Background.BeginTweening( 2 );
m_Background.SetTweenDiffuse( RageColor(1,1,1,1) );
m_StageName.SetText( GAMESTATE->m_pCurSong->m_sMainTitle );
m_textSongTitle.SetText( GAMESTATE->m_pCurSong->m_sMainTitle );
/* XXX: set it to the current BPM, not the range */
float fMinBPM, fMaxBPM;
@@ -1471,7 +1471,7 @@ void ScreenGameplay::HandleScreenMessage( const ScreenMessage SM )
if( GAMESTATE->IsPlayerEnabled(p) )
fMaxSurviveSeconds = max( fMaxSurviveSeconds, GAMESTATE->m_CurStageStats.fAliveSeconds[p] );
ASSERT( fMaxSurviveSeconds > 0 );
m_textSurviveTime.SetText( "TIME " + SecondsToTime(fMaxSurviveSeconds) );
m_textSurviveTime.SetText( SecondsToTime(fMaxSurviveSeconds) );
m_textSurviveTime.BeginTweening( 0.3f ); // sleep
m_textSurviveTime.BeginTweening( 0.3f ); // fade in
m_textSurviveTime.SetTweenDiffuse( RageColor(1,1,1,1) );
stepmania/src/ScreenGameplay.h
+2 -2
View File
@@ -129,8 +129,8 @@ protected:
TransitionBGAnimation m_In;
TransitionBGAnimation m_Back;
BitmapText m_textSurviveTime; // only shown in extra stage
BitmapText m_StageName;
BitmapText m_textSurviveTime; // used in extra stage
BitmapText m_textSongTitle;
Player m_Player[NUM_PLAYERS];
stepmania/src/ScreenJukeboxMenu.cpp
+1 -1
View File
@@ -47,7 +47,7 @@ ScreenJukeboxMenu::ScreenJukeboxMenu()
this->AddChild( &m_Menu );
m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textExplanation.SetXY( EXPLANATION_X, EXPLANATION_Y );
m_textExplanation.SetText( EXPLANATION_TEXT );
m_textExplanation.SetZoom( 0.7f );
stepmania/src/ScreenLogo.cpp
+2 -2
View File
@@ -28,13 +28,13 @@ ScreenLogo::ScreenLogo() : ScreenAttract("ScreenLogo")
m_sprLogo.Command( LOGO_ON_COMMAND );
this->AddChild( &m_sprLogo );
m_textVersion.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textVersion.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textVersion.Command( VERSION_ON_COMMAND );
m_textVersion.SetText( "CVS" );
this->AddChild( &m_textVersion );
m_textSongs.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textSongs.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textSongs.Command( SONGS_ON_COMMAND );
m_textSongs.SetText( ssprintf("%d songs in %d groups, %d courses", SONGMAN->GetNumSongs(), SONGMAN->GetNumGroups(), SONGMAN->GetNumCourses()) );
this->AddChild( &m_textSongs );
stepmania/src/ScreenManager.cpp
+5 -5
View File
@@ -65,7 +65,7 @@ public:
ScreenSystemLayer::ScreenSystemLayer()
{
m_textSystemMessage.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textSystemMessage.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textSystemMessage.SetHorizAlign( Actor::align_left );
m_textSystemMessage.SetVertAlign( Actor::align_top );
m_textSystemMessage.SetXY( 4.0f, 4.0f );
@@ -74,7 +74,7 @@ ScreenSystemLayer::ScreenSystemLayer()
m_textSystemMessage.SetDiffuse( RageColor(1,1,1,0) );
this->AddChild(&m_textSystemMessage);
m_textStats.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textStats.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textStats.SetXY( STATS_X, STATS_Y );
m_textStats.SetHorizAlign( Actor::align_right );
m_textStats.SetVertAlign( Actor::align_top );
@@ -82,7 +82,7 @@ ScreenSystemLayer::ScreenSystemLayer()
m_textStats.SetShadowLength( 2 );
this->AddChild(&m_textStats);
m_textSysTime.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textSysTime.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textSysTime.SetXY( 4.0f, 40.0f );
m_textSysTime.SetHorizAlign( Actor::align_left );
m_textSysTime.SetVertAlign( Actor::align_top );
@@ -93,7 +93,7 @@ ScreenSystemLayer::ScreenSystemLayer()
for( int p=0; p<NUM_PLAYERS; p++ )
{
m_textCreditInfo[p].LoadFromFont( THEME->GetPathTo("Fonts","credits") );
m_textCreditInfo[p].LoadFromFont( THEME->GetPathTo("Fonts","ScreenManager credits") );
m_textCreditInfo[p].SetXY( CREDITS_X(p), CREDITS_Y(p) );
m_textCreditInfo[p].SetZoom( CREDITS_ZOOM );
m_textCreditInfo[p].SetDiffuse( CREDITS_COLOR );
@@ -120,7 +120,7 @@ ScreenSystemLayer::ScreenSystemLayer()
/* This is somewhat big. Let's put it on the right side, where it'll
* obscure the 2P side during gameplay; there's nowhere to put it that
* doesn't obscure something, and it's just a diagnostic. */
m_Skips[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_Skips[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_Skips[i].SetXY( SKIP_LEFT, SKIP_TOP + SKIP_Y_DIST*i );
m_Skips[i].SetHorizAlign( Actor::align_left );
m_Skips[i].SetVertAlign( Actor::align_top );
stepmania/src/ScreenMapControllers.cpp
+2 -2
View File
@@ -70,7 +70,7 @@ ScreenMapControllers::ScreenMapControllers()
{
for( int s=0; s<NUM_GAME_TO_DEVICE_SLOTS; s++ )
{
m_textMappedTo[p][b][s].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textMappedTo[p][b][s].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textMappedTo[p][b][s].SetXY( BUTTON_COLUMN_X[p*NUM_GAME_TO_DEVICE_SLOTS+s], LINE_START_Y + b*LINE_GAP_Y );
m_textMappedTo[p][b][s].SetZoom( 0.5f );
m_textMappedTo[p][b][s].SetShadowLength( 2 );
@@ -79,7 +79,7 @@ ScreenMapControllers::ScreenMapControllers()
}
}
m_textError.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textError.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textError.SetText( "" );
m_textError.SetXY( CENTER_X, CENTER_Y );
m_textError.SetDiffuse( RageColor(0,1,0,0) );
stepmania/src/ScreenMiniMenu.cpp
+3 -3
View File
@@ -57,7 +57,7 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes
float fHeightOfAll = (m_Def.rows.size()-1)*SPACING_Y;
m_textTitle.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textTitle.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textTitle.SetText( m_Def.title );
m_textTitle.SetXY( CENTER_X, CENTER_Y - fHeightOfAll/2 - 30 );
m_textTitle.SetZoom( 0.8f );
@@ -75,7 +75,7 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes
float fY = SCALE( i, 0.f, m_Def.rows.size()-1.f, CENTER_Y-fHeightOfAll/2, CENTER_Y+fHeightOfAll/2 );
m_textLabel[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textLabel[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textLabel[i].SetText( line.name );
m_textLabel[i].SetY( fY );
m_textLabel[i].SetZoom( ZOOM_NOT_SELECTED );
@@ -84,7 +84,7 @@ ScreenMiniMenu::ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMes
this->AddChild( &m_textLabel[i] );
CString sText = line.choices.empty() ? "" : line.choices[line.defaultChoice];
m_textAnswer[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textAnswer[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textAnswer[i].SetText( sText );
m_textAnswer[i].SetY( fY );
m_textAnswer[i].SetZoom( ZOOM_NOT_SELECTED );
stepmania/src/ScreenNameEntry.cpp
+2 -2
View File
@@ -172,14 +172,14 @@ ScreenNameEntry::ScreenNameEntry()
float ColX = pStyleDef->m_iCenterX[p] + pStyleDef->m_ColumnInfo[p][t].fXOffset;
m_textSelectedChars[p][t].LoadFromFont( THEME->GetPathTo("Fonts","ranking") );
m_textSelectedChars[p][t].LoadFromFont( THEME->GetPathTo("Fonts","ScreenNameEntry letters") );
m_textSelectedChars[p][t].SetX( ColX );
m_textSelectedChars[p][t].SetY( GRAY_ARROWS_Y );
m_textSelectedChars[p][t].SetDiffuse( g_SelectedCharsColor );
m_textSelectedChars[p][t].SetZoom( CHARS_ZOOM_LARGE );
this->AddChild( &m_textSelectedChars[p][t] ); // draw these manually
m_textScrollingChars[p][t].LoadFromFont( THEME->GetPathTo("Fonts","ranking") );
m_textScrollingChars[p][t].LoadFromFont( THEME->GetPathTo("Fonts","ScreenNameEntry letters") );
m_textScrollingChars[p][t].SetX( ColX );
m_textScrollingChars[p][t].SetY( GRAY_ARROWS_Y );
m_textScrollingChars[p][t].SetDiffuse( g_ScrollingCharsColor );
stepmania/src/ScreenOptions.cpp
+4 -4
View File
@@ -131,7 +131,7 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRow[], int iNumOptionLin
m_framePage.AddChild( &m_textOptions[i][0] );
// add explanation here so it appears on top
m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","option explanation") );
m_textExplanation.LoadFromFont( THEME->GetPathTo("Fonts","ScreenOptions explanation") );
m_textExplanation.SetXY( EXPLANATION_X, EXPLANATION_Y );
m_textExplanation.SetZoom( EXPLANATION_ZOOM );
m_textExplanation.SetShadowLength( 2 );
@@ -177,7 +177,7 @@ void ScreenOptions::InitOptionsText()
BitmapText &title = m_textOptionLineTitles[i];
title.LoadFromFont( THEME->GetPathTo("Fonts","option title") );
title.LoadFromFont( THEME->GetPathTo("Fonts","ScreenOptions title") );
CString sText = optline.name;
title.SetText( sText );
@@ -199,7 +199,7 @@ void ScreenOptions::InitOptionsText()
{
BitmapText &option = m_textOptions[i][j];
option.LoadFromFont( THEME->GetPathTo("Fonts","option item") );
option.LoadFromFont( THEME->GetPathTo("Fonts","ScreenOptions item") );
option.SetText( optline.choices[j] );
option.SetZoom( ITEMS_ZOOM );
option.EnableShadow( false );
@@ -213,7 +213,7 @@ void ScreenOptions::InitOptionsText()
}
BitmapText &option = m_textOptions[i][0];
option.LoadFromFont( THEME->GetPathTo("Fonts","option item") );
option.LoadFromFont( THEME->GetPathTo("Fonts","ScreenOptions item") );
option.SetText( "EXIT" );
option.SetZoom( ITEMS_ZOOM );
option.SetShadowLength( 2 );
stepmania/src/ScreenPlayerOptions.cpp
+1 -51
View File
@@ -60,16 +60,6 @@ ScreenPlayerOptions::ScreenPlayerOptions() :
true, false );
SOUNDMAN->PlayOnceFromDir( ANNOUNCER->GetPathTo("player options intro") );
m_sprOptionsMessage.Load( THEME->GetPathTo("Graphics","ScreenPlayerOptions options") );
m_sprOptionsMessage.StopAnimating();
m_sprOptionsMessage.SetXY( CENTER_X, CENTER_Y );
m_sprOptionsMessage.SetZoom( 1 );
m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) );
//this->AddChild( &m_sprOptionsMessage ); // we have to draw this manually over the top of transitions
m_bAcceptedChoices = false;
m_bGoToOptions = false;
}
@@ -197,7 +187,7 @@ void ScreenPlayerOptions::GoToNextState()
{
if( GAMESTATE->m_bEditing )
SCREENMAN->PopTopScreen();
else if( m_bGoToOptions )
else if( PREFSMAN->m_bShowSongOptions )
SCREENMAN->SetNewScreen( "ScreenSongOptions" );
else
SCREENMAN->SetNewScreen( "ScreenStage" );
@@ -207,60 +197,20 @@ void ScreenPlayerOptions::GoToNextState()
void ScreenPlayerOptions::Update( float fDelta )
{
ScreenOptions::Update( fDelta );
m_sprOptionsMessage.Update( fDelta );
}
void ScreenPlayerOptions::DrawPrimitives()
{
ScreenOptions::DrawPrimitives();
m_sprOptionsMessage.Draw();
}
void ScreenPlayerOptions::Input( const DeviceInput& DeviceI, const InputEventType type, const GameInput &GameI, const MenuInput &MenuI, const StyleInput &StyleI )
{
if( !GAMESTATE->m_bEditing &&
!m_Menu.m_In.IsTransitioning() &&
MenuI.IsValid() &&
MenuI.button == MENU_BUTTON_START &&
type != IET_RELEASE &&
PREFSMAN->m_bShowSongOptions )
{
if( m_bAcceptedChoices && !m_bGoToOptions )
{
m_bGoToOptions = true;
m_sprOptionsMessage.SetState( 1 );
SOUNDMAN->PlayOnce( THEME->GetPathTo("Sounds","Common start") );
}
}
ScreenOptions::Input( DeviceI, type, GameI, MenuI, StyleI );
}
void ScreenPlayerOptions::HandleScreenMessage( const ScreenMessage SM )
{
switch( SM )
{
case SM_BeginFadingOut: // when the user accepts the page of options
{
m_bAcceptedChoices = true;
if( !GAMESTATE->m_bEditing )
{
float fShowSeconds = m_Menu.m_Out.GetLengthSeconds();
// show "hold START for options"
m_sprOptionsMessage.SetDiffuse( RageColor(1,1,1,0) );
m_sprOptionsMessage.BeginTweening( 0.15f ); // fade in
m_sprOptionsMessage.SetTweenZoomY( 1 );
m_sprOptionsMessage.SetTweenDiffuse( RageColor(1,1,1,1) );
m_sprOptionsMessage.BeginTweening( fShowSeconds-0.3f ); // sleep
m_sprOptionsMessage.BeginTweening( 0.15f ); // fade out
m_sprOptionsMessage.SetTweenDiffuse( RageColor(1,1,1,0) );
m_sprOptionsMessage.SetTweenZoomY( 0 );
}
}
break;
}
ScreenOptions::HandleScreenMessage( SM );
}
stepmania/src/ScreenPlayerOptions.h
-4
View File
@@ -31,10 +31,6 @@ private:
void GoToNextState();
void GoToPrevState();
bool m_bAcceptedChoices;
bool m_bGoToOptions;
Sprite m_sprOptionsMessage;
};
stepmania/src/ScreenPrompt.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ ScreenPrompt::ScreenPrompt( ScreenMessage SM_SendWhenDone, CString sText, bool b
m_Fade.CloseWipingRight();
this->AddChild( &m_Fade );
m_textQuestion.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textQuestion.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textQuestion.SetText( sText );
m_textQuestion.SetXY( QUESTION_X, QUESTION_Y );
this->AddChild( &m_textQuestion );
stepmania/src/ScreenRanking.cpp
+6 -6
View File
@@ -47,12 +47,12 @@ const ScreenMessage SM_HidePage = (ScreenMessage)(SM_User+68);
ScreenRanking::ScreenRanking() : ScreenAttract("ScreenRanking")
{
m_textCategory.LoadFromFont( THEME->GetPathTo("Fonts","Header2") );
m_textCategory.LoadFromFont( THEME->GetPathTo("Fonts","ScreenRanking title") );
m_textCategory.EnableShadow( false );
m_textCategory.SetXY( CATEGORY_X, CATEGORY_Y );
this->AddChild( &m_textCategory );
m_textType.LoadFromFont( THEME->GetPathTo("Fonts","Header2") );
m_textType.LoadFromFont( THEME->GetPathTo("Fonts","ScreenRanking title") );
m_textType.EnableShadow( false );
m_textType.SetXY( TYPE_X, TYPE_Y );
this->AddChild( &m_textType );
@@ -66,28 +66,28 @@ ScreenRanking::ScreenRanking() : ScreenAttract("ScreenRanking")
m_sprBullets[i].SetState(i);
this->AddChild( &m_sprBullets[i] );
m_textNames[i].LoadFromFont( THEME->GetPathTo("Fonts","ranking") );
m_textNames[i].LoadFromFont( THEME->GetPathTo("Fonts","ScreenRanking letters") );
m_textNames[i].EnableShadow( false );
m_textNames[i].SetXY( NAMES_START_X+LINE_SPACING_X*i, NAMES_START_Y+LINE_SPACING_Y*i );
m_textNames[i].SetZoom( TEXT_ZOOM );
m_textNames[i].SetHorizAlign( Actor::align_left );
this->AddChild( &m_textNames[i] );
m_textScores[i].LoadFromFont( THEME->GetPathTo("Fonts","ranking") );
m_textScores[i].LoadFromFont( THEME->GetPathTo("Fonts","ScreenRanking letters") );
m_textScores[i].EnableShadow( false );
m_textScores[i].SetXY( SCORES_START_X+LINE_SPACING_X*i, SCORES_START_Y+LINE_SPACING_Y*i );
m_textScores[i].SetZoom( TEXT_ZOOM );
m_textScores[i].SetHorizAlign( Actor::align_right );
this->AddChild( &m_textScores[i] );
m_textPoints[i].LoadFromFont( THEME->GetPathTo("Fonts","ranking") );
m_textPoints[i].LoadFromFont( THEME->GetPathTo("Fonts","ScreenRanking letters") );
m_textPoints[i].EnableShadow( false );
m_textPoints[i].SetXY( POINTS_START_X+LINE_SPACING_X*i, POINTS_START_Y+LINE_SPACING_Y*i );
m_textPoints[i].SetZoom( TEXT_ZOOM );
m_textPoints[i].SetHorizAlign( Actor::align_right );
this->AddChild( &m_textPoints[i] );
m_textTime[i].LoadFromFont( THEME->GetPathTo("Fonts","ranking") );
m_textTime[i].LoadFromFont( THEME->GetPathTo("Fonts","ScreenRanking letters") );
m_textTime[i].EnableShadow( false );
m_textTime[i].SetXY( TIME_START_X+LINE_SPACING_X*i, TIME_START_Y+LINE_SPACING_Y*i );
m_textTime[i].SetZoom( TEXT_ZOOM );
stepmania/src/ScreenSelectCourse.cpp
+4 -4
View File
@@ -83,14 +83,14 @@ ScreenSelectCourse::ScreenSelectCourse()
m_sprBannerFrame.SetXY( BANNER_FRAME_X, BANNER_FRAME_Y );
this->AddChild( &m_sprBannerFrame );
m_textNumSongs.LoadFromFont( THEME->GetPathTo("Fonts","ScreenSelectCourse num songs") );
m_textNumSongs.SetXY( STAGES_X, STAGES_Y );
m_textNumSongs.LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenSelectCourse num songs") );
m_textNumSongs.EnableShadow( false );
m_textNumSongs.SetXY( STAGES_X, STAGES_Y );
this->AddChild( &m_textNumSongs );
m_textTime.LoadFromFont( THEME->GetPathTo("Fonts","ScreenSelectCourse total time") );
m_textTime.SetXY( TIME_X, TIME_Y );
m_textTime.LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenSelectCourse total time") );
m_textTime.EnableShadow( false );
m_textTime.SetXY( TIME_X, TIME_Y );
this->AddChild( &m_textTime );
m_CourseContentsFrame.SetXY( CONTENTS_X, CONTENTS_Y );
stepmania/src/ScreenSelectGroup.cpp
+1 -1
View File
@@ -133,7 +133,7 @@ ScreenSelectGroup::ScreenSelectGroup()
m_sprFrame.Load( THEME->GetPathTo("Graphics","ScreenSelectGroup frame") );
this->AddChild( &m_sprFrame );
m_textNumber.LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenSelectGroup numbers") );
m_textNumber.LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenSelectGroup num songs") );
this->AddChild( &m_textNumber );
m_sprContents.Load( THEME->GetPathTo("Graphics","ScreenSelectGroup contents") );
stepmania/src/ScreenSelectMusic.cpp
+2 -2
View File
@@ -117,7 +117,7 @@ ScreenSelectMusic::ScreenSelectMusic()
this->AddChild( &m_GrooveRadar );
m_textSongOptions.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textSongOptions.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
this->AddChild( &m_textSongOptions );
this->AddChild( &m_MusicWheel );
@@ -154,7 +154,7 @@ ScreenSelectMusic::ScreenSelectMusic()
m_sprHighScoreFrame[p].SetState( p );
this->AddChild( &m_sprHighScoreFrame[p] );
m_textHighScore[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenSelectMusic score numbers") );
m_textHighScore[p].LoadFromNumbers( THEME->GetPathTo("Numbers","ScreenSelectMusic score") );
m_textHighScore[p].EnableShadow( false );
m_textHighScore[p].SetDiffuse( PlayerToColor(p) );
this->AddChild( &m_textHighScore[p] );
stepmania/src/ScreenSelectStyle.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ ScreenSelectStyle::ScreenSelectStyle() : ScreenSelect( "ScreenSelectStyle" )
CString sIconPath = THEME->GetPathTo("Graphics",sIconElementName);
if( sIconPath.empty() ) // element doesn't exist
{
m_textIcon[i].LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textIcon[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textIcon[i].SetText( mc.name );
m_textIcon[i].SetZoom(0.5f);
this->AddChild( &m_textIcon[i] );
stepmania/src/ScreenTestSound.cpp
+2 -2
View File
@@ -27,7 +27,7 @@ ScreenTestSound::ScreenTestSound()
this->AddChild(&HEEEEEEEEELP);
HEEEEEEEEELP.SetXY(450, 400);
HEEEEEEEEELP.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
HEEEEEEEEELP.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
HEEEEEEEEELP.SetZoom(.5);
HEEEEEEEEELP.SetText(
"p Play\n"
@@ -39,7 +39,7 @@ ScreenTestSound::ScreenTestSound()
for(i = 0; i < nsounds; ++i)
{
this->AddChild(&s[i].txt);
s[i].txt.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
s[i].txt.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
s[i].txt.SetZoom(.5);
}
stepmania/src/ScreenTextEntry.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ ScreenTextEntry::ScreenTextEntry( ScreenMessage SM_SendWhenDone, CString sQuesti
m_Fade.CloseWipingRight();
this->AddChild( &m_Fade );
m_textQuestion.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textQuestion.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textQuestion.SetText( sQuestion );
m_textQuestion.SetXY( QUESTION_X, QUESTION_Y );
this->AddChild( &m_textQuestion );
stepmania/src/ScreenTitleMenu.cpp
+2 -2
View File
@@ -76,7 +76,7 @@ ScreenTitleMenu::ScreenTitleMenu()
ASSERT(0);
}
m_textHelp.LoadFromFont( THEME->GetPathTo("Fonts","help") );
m_textHelp.LoadFromFont( THEME->GetPathTo("Fonts","ScreenTitleMenu help") );
CString sHelpText;
switch( PREFSMAN->m_CoinMode )
{
@@ -99,7 +99,7 @@ ScreenTitleMenu::ScreenTitleMenu()
int i;
for( i=0; i<NUM_CHOICES; i++ )
{
m_textChoice[i].LoadFromFont( THEME->GetPathTo("Fonts","titlemenu") );
m_textChoice[i].LoadFromFont( THEME->GetPathTo("Fonts","ScreenTitleMenu choices") );
m_textChoice[i].SetText( ChoiceToString((Choice)i) );
m_textChoice[i].SetXY( CHOICES_X, CHOICES_START_Y + i*CHOICES_SPACING_Y );
m_textChoice[i].SetShadowLength( CHOICES_SHADOW_LENGTH );
stepmania/src/StepMania.dsp
+10 -10
View File
@@ -60,7 +60,7 @@ IntDir=.\../Release6
TargetDir=\stepmania\stepmania
TargetName=StepMania
SOURCE="$(InputPath)"
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
# End Special Build Tool
@@ -95,7 +95,7 @@ IntDir=.\../Debug6
TargetDir=\stepmania\stepmania
TargetName=StepMania-debug
SOURCE="$(InputPath)"
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
# End Special Build Tool
@@ -1068,6 +1068,14 @@ SOURCE=.\GroupList.h
# End Source File
# Begin Source File
SOURCE=.\HelpDisplay.cpp
# End Source File
# Begin Source File
SOURCE=.\HelpDisplay.h
# End Source File
# Begin Source File
SOURCE=.\JukeboxMenu.cpp
# End Source File
# Begin Source File
@@ -1196,14 +1204,6 @@ SOURCE=.\TextBanner.h
# End Source File
# Begin Source File
SOURCE=.\TipDisplay.cpp
# End Source File
# Begin Source File
SOURCE=.\TipDisplay.h
# End Source File
# Begin Source File
SOURCE=.\WheelNotifyIcon.cpp
# End Source File
# Begin Source File
stepmania/src/StepMania.vcproj
+6 -6
View File
@@ -1065,6 +1065,12 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
<File
RelativePath="GroupList.h">
</File>
<File
RelativePath="HelpDisplay.cpp">
</File>
<File
RelativePath="HelpDisplay.h">
</File>
<File
RelativePath="JukeboxMenu.cpp">
</File>
@@ -1167,12 +1173,6 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
<File
RelativePath=".\TextBanner.h">
</File>
<File
RelativePath=".\TipDisplay.cpp">
</File>
<File
RelativePath=".\TipDisplay.h">
</File>
<File
RelativePath="WheelNotifyIcon.cpp">
</File>
stepmania/src/TextBanner.cpp
+3 -3
View File
@@ -67,9 +67,9 @@ TextBanner::TextBanner()
g_fThreeLinesSubTitleY = THREE_LINES_SUB_TITLE_Y;
g_fThreeLinesArtistY = THREE_LINES_ARTIST_Y;
m_textTitle.LoadFromFont( THEME->GetPathTo("Fonts","musicwheel text banner") );
m_textSubTitle.LoadFromFont( THEME->GetPathTo("Fonts","musicwheel text banner") );
m_textArtist.LoadFromFont( THEME->GetPathTo("Fonts","musicwheel text banner") );
m_textTitle.LoadFromFont( THEME->GetPathTo("Fonts","TextBanner") );
m_textSubTitle.LoadFromFont( THEME->GetPathTo("Fonts","TextBanner") );
m_textArtist.LoadFromFont( THEME->GetPathTo("Fonts","TextBanner") );
m_textTitle.SetX( -g_fWidth/2 );
m_textSubTitle.SetX( -g_fWidth/2 );
stepmania/src/TransitionOniFade.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ TransitionOniFade::TransitionOniFade()
m_quadStrip.StretchTo( RectI(SCREEN_LEFT, int(CENTER_Y-30), SCREEN_RIGHT, int(CENTER_Y+30)) );
m_textSongInfo.LoadFromFont( THEME->GetPathTo("Fonts","normal") );
m_textSongInfo.LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
m_textSongInfo.EnableShadow( false );
m_textSongInfo.SetZoom( 0.5f );
m_textSongInfo.SetXY( CENTER_X, CENTER_Y );
stepmania/src/smpackage/onvertThemeDlg.cpp
+30 -9
View File
@@ -211,20 +211,40 @@ bool FilesAreIdentical( CString sPath1, CString sPath2 )
FILE* fp1 = fopen( sPath1, "r" );
FILE* fp2 = fopen( sPath2, "r" );
bool bReturn;
if( GetFileSizeInBytes(sPath1) != GetFileSizeInBytes(sPath2) )
return false;
{
bReturn = false;
goto clean_up;
}
char buffer1[1024], buffer2[1024];
ZERO( buffer1 );
ZERO( buffer2 );
while( !feof(fp1) )
{
fread( buffer1, 1, sizeof(buffer1), fp1 );
fread( buffer2, 1, sizeof(buffer2), fp2 );
if( memcmp( buffer1, buffer2, sizeof(buffer1) ) != 0 )
return false;
int size1 = fread( buffer1, 1, sizeof(buffer1), fp1 );
int size2 = fread( buffer2, 1, sizeof(buffer2), fp2 );
if( size1 != size2 )
{
bReturn = false;
goto clean_up;
}
if( memcmp( buffer1, buffer2, sizeof(size1) ) != 0 )
{
bReturn = false;
goto clean_up;
}
}
return true;
bReturn = true;
goto clean_up;
clean_up:
fclose( fp1 );
fclose( fp2 );
return bReturn;
}
CString StripExtension( CString sPath )
@@ -298,7 +318,8 @@ void ConvertThemeDlg::OnButtonAnalyze()
if( sThemeElement.CompareNoCase(sBaseElement)==0 ) // file names match
{
if( FilesAreIdentical( asThemeFilePaths[i], asBaseFilePaths[j] ) )
bFoundMatch = true;
if( FilesAreIdentical( asThemeFilePaths[i], asBaseFilePaths[j] ) )
asRedundant.Add( asThemeFilePaths[i] );
break; // skip to next file in asThemeFilePaths
}
@@ -320,8 +341,8 @@ void ConvertThemeDlg::OnButtonAnalyze()
fprintf( fp, asRedundant[i] + "\n" );
fprintf( fp, "\n" );
fprintf( fp, "The following elements are possibly MISNAMED.\n"
" (These files do not have a corresponding element in\n"
" the base theme. This likely means that there is an error in the file name.)\n" );
" (These files do not have a corresponding element in the base theme.\n"
" This likely means that there is an error in the file name.)\n" );
for( i=0; i<asWarning.GetSize(); i++ )
fprintf( fp, asWarning[i] + "\n" );
fclose( fp );
stepmania/src/smpackage/smpackage.clw
+2 -2
View File
@@ -16,7 +16,7 @@ Resource1=IDR_MAINFRAME
Resource2=IDD_EXPORTER
Class3=CSMPackageInstallDlg
Class4=CSmpackageExportDlg
Resource3=IDD_CONVERT_THEME
Resource3=IDD_MENU
Class5=EnterName
Resource4=IDD_DIALOG_NAME
Class6=EditInsallations
@@ -24,7 +24,7 @@ Resource5=IDD_INSTALL
Class7=MainMenuDlg
Resource6=IDD_EDIT_INSTALLATIONS
Class8=ConvertThemeDlg
Resource7=IDD_MENU
Resource7=IDD_CONVERT_THEME
Class9=EditMetricsDlg
Resource8=IDD_EDIT_METRICS
stepmania/src/smpackage/smpackage.rc
+1 -1
View File
@@ -183,7 +183,7 @@ BEGIN
CONTROL 144,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38
LISTBOX IDC_LIST_THEMES,7,44,88,186,LBS_SORT |
LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Convert from 3.0 to 4.0",IDC_BUTTON_CONVERT,170,51,95,
PUSHBUTTON "Convert from 3.0 to 4.0",IDC_BUTTON_CONVERT,164,51,95,
15,WS_DISABLED
LTEXT "This will convert the element names in a SM 3.0 theme to the SM 4.0 theme names. A converted theme will no longer be compatible with StepMania 3.0, so make a backup. This tool does not convert theme metrics.",
IDC_STATIC,110,71,210,33