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

Add missing consts.

Browse Source
This commit is contained in:
Glenn Maynard
2002-09-06 01:52:27 +00:00
parent 981da81f93
commit 0d9bed6c51
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenStage.cpp
+3 -2
View File
@@ -214,7 +214,8 @@ ScreenStage::ScreenStage()
m_quadMask.SetDiffuse( D3DXCOLOR(0,0,0,0) ); m_quadMask.SetDiffuse( D3DXCOLOR(0,0,0,0) );
m_quadMask.StretchTo( CRect(SCREEN_LEFT, roundf(fStageOffScreenY-fStageHeight/2), m_quadMask.StretchTo( CRect(SCREEN_LEFT, roundf(fStageOffScreenY-fStageHeight/2),
SCREEN_RIGHT, roundf(fStageOffScreenY+fStageHeight/2)) ); SCREEN_RIGHT, roundf(fStageOffScreenY+fStageHeight/2)) );
m_quadMask.SetZ( -1 ); // important: fill Z buffer with values that will cause subsequent draws to fail the Z test /* Put the quad mask on top, so draws to the Stage will be "under" it. */
m_quadMask.SetZ( -1 );
m_frameStage.SetXY( CENTER_X, fStageOffScreenY ); m_frameStage.SetXY( CENTER_X, fStageOffScreenY );
m_frameStage.BeginTweening(0.8f, Actor::TWEEN_BIAS_BEGIN ); m_frameStage.BeginTweening(0.8f, Actor::TWEEN_BIAS_BEGIN );
@@ -227,7 +228,7 @@ ScreenStage::ScreenStage()
// //
if( g_StageType == STAGE_TYPE_PUMP ) if( g_StageType == STAGE_TYPE_PUMP )
{ {
Song* pSong = GAMESTATE->m_pCurSong; const Song* pSong = GAMESTATE->m_pCurSong;
m_sprSongBackground.Load( (pSong && pSong->HasBackground()) ? pSong->GetBackgroundPath() : THEME->GetPathTo("Graphics","fallback background") ); m_sprSongBackground.Load( (pSong && pSong->HasBackground()) ? pSong->GetBackgroundPath() : THEME->GetPathTo("Graphics","fallback background") );
m_sprSongBackground.StretchTo( CRect(SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM) ); m_sprSongBackground.StretchTo( CRect(SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM) );
stepmania/src/song.h
+11 -11
View File
@@ -113,19 +113,19 @@ public:
CString m_sCDTitleFile; CString m_sCDTitleFile;
CString m_sMovieBackgroundFile; CString m_sMovieBackgroundFile;
CString GetMusicPath() {return m_sMusicFile.Find('.')==0 ? m_sMusicFile : m_sSongDir+m_sMusicFile; }; CString GetMusicPath() const {return m_sMusicFile.Find('.')==0 ? m_sMusicFile : m_sSongDir+m_sMusicFile; };
CString GetBannerPath() {return m_sSongDir+m_sBannerFile; }; CString GetBannerPath() const {return m_sSongDir+m_sBannerFile; };
CString GetBackgroundPath() {return m_sSongDir+m_sBackgroundFile; }; CString GetBackgroundPath() const {return m_sSongDir+m_sBackgroundFile; };
CString GetCDTitlePath() {return m_sCDTitleFile.Find('.')==0 ? m_sCDTitleFile : m_sSongDir+m_sCDTitleFile; }; CString GetCDTitlePath() const {return m_sCDTitleFile.Find('.')==0 ? m_sCDTitleFile : m_sSongDir+m_sCDTitleFile; };
CString GetMovieBackgroundPath(){return m_sSongDir+m_sMovieBackgroundFile; }; CString GetMovieBackgroundPath() const {return m_sSongDir+m_sMovieBackgroundFile; };
bool HasMusic() {return m_sMusicFile != "" && IsAFile(GetMusicPath()); }; bool HasMusic() const {return m_sMusicFile != "" && IsAFile(GetMusicPath()); };
bool HasBanner() {return m_sBannerFile != "" && IsAFile(GetBannerPath()); }; bool HasBanner() const {return m_sBannerFile != "" && IsAFile(GetBannerPath()); };
bool HasBackground() {return m_sBackgroundFile != "" && IsAFile(GetBackgroundPath()); }; bool HasBackground() const {return m_sBackgroundFile != "" && IsAFile(GetBackgroundPath()); };
bool HasCDTitle() {return m_sCDTitleFile != "" && IsAFile(GetCDTitlePath()); }; bool HasCDTitle() const {return m_sCDTitleFile != "" && IsAFile(GetCDTitlePath()); };
bool HasMovieBackground() {return m_sMovieBackgroundFile != ""&& IsAFile(GetMovieBackgroundPath()); }; bool HasMovieBackground() const {return m_sMovieBackgroundFile != ""&& IsAFile(GetMovieBackgroundPath()); };
bool HasBGChanges() {return m_BackgroundChanges.GetSize() > 0; }; bool HasBGChanges() const {return m_BackgroundChanges.GetSize() > 0; };
CArray<BPMSegment, BPMSegment&> m_BPMSegments; // this must be sorted before gameplay CArray<BPMSegment, BPMSegment&> m_BPMSegments; // this must be sorted before gameplay
CArray<StopSegment, StopSegment&> m_StopSegments; // this must be sorted before gameplay CArray<StopSegment, StopSegment&> m_StopSegments; // this must be sorted before gameplay