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

fix compile error, change RString to const RString& because I can; again, PLEASE try to compile your build before committing it :|

Browse Source
This commit is contained in:
Mark Cannon
2011-10-06 23:32:23 -04:00
parent 8b82873eb4
commit deb8ea5347
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenGameplay.cpp
+1 -1
View File
@@ -1429,7 +1429,7 @@ void ScreenGameplay::PlayTicks()
} }
/* Play announcer "type" if it's been at least fSeconds since the last announcer. */ /* Play announcer "type" if it's been at least fSeconds since the last announcer. */
void ScreenGameplay::PlayAnnouncer( RString type, float fSeconds, float *fDeltaSeconds ) void ScreenGameplay::PlayAnnouncer( const RString &type, float fSeconds, float *fDeltaSeconds )
{ {
if( GAMESTATE->m_fOpponentHealthPercent == 0 ) if( GAMESTATE->m_fOpponentHealthPercent == 0 )
return; // Shut the announcer up return; // Shut the announcer up
src/ScreenGameplay.h
+2 -2
View File
@@ -206,8 +206,8 @@ protected:
void GetMusicEndTiming( float &fSecondsToStartFadingOutMusic, float &fSecondsToStartTransitioningOut ); void GetMusicEndTiming( float &fSecondsToStartFadingOutMusic, float &fSecondsToStartTransitioningOut );
void LoadLights(); void LoadLights();
void PauseGame( bool bPause, GameController gc = GameController_Invalid ); void PauseGame( bool bPause, GameController gc = GameController_Invalid );
void PlayAnnouncer( RString type, float fSeconds, float *fDeltaSeconds ); void PlayAnnouncer( const RString &type, float fSeconds, float *fDeltaSeconds );
void PlayAnnouncer( RString type, float fSeconds ) { PlayAnnouncer(type, fSeconds, &m_fTimeSinceLastDancingComment) }; void PlayAnnouncer( const RString &type, float fSeconds ) { PlayAnnouncer(type, fSeconds, &m_fTimeSinceLastDancingComment); }
void UpdateLights(); void UpdateLights();
void SendCrossedMessages(); void SendCrossedMessages();
void BeginBackingOutFromGameplay(); void BeginBackingOutFromGameplay();