From deb8ea53477a61db038d90bad7e5897280d1ab77 Mon Sep 17 00:00:00 2001 From: Mark Cannon Date: Thu, 6 Oct 2011 23:32:23 -0400 Subject: [PATCH] fix compile error, change RString to const RString& because I can; again, PLEASE try to compile your build before committing it :| --- src/ScreenGameplay.cpp | 2 +- src/ScreenGameplay.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp index 3226f92e46..7e29ce2ad0 100644 --- a/src/ScreenGameplay.cpp +++ b/src/ScreenGameplay.cpp @@ -1429,7 +1429,7 @@ void ScreenGameplay::PlayTicks() } /* 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 ) return; // Shut the announcer up diff --git a/src/ScreenGameplay.h b/src/ScreenGameplay.h index ee2e4a58c4..182d12ed31 100644 --- a/src/ScreenGameplay.h +++ b/src/ScreenGameplay.h @@ -206,8 +206,8 @@ protected: void GetMusicEndTiming( float &fSecondsToStartFadingOutMusic, float &fSecondsToStartTransitioningOut ); void LoadLights(); void PauseGame( bool bPause, GameController gc = GameController_Invalid ); - void PlayAnnouncer( RString type, float fSeconds, float *fDeltaSeconds ); - void PlayAnnouncer( RString type, float fSeconds ) { PlayAnnouncer(type, fSeconds, &m_fTimeSinceLastDancingComment) }; + void PlayAnnouncer( const RString &type, float fSeconds, float *fDeltaSeconds ); + void PlayAnnouncer( const RString &type, float fSeconds ) { PlayAnnouncer(type, fSeconds, &m_fTimeSinceLastDancingComment); } void UpdateLights(); void SendCrossedMessages(); void BeginBackingOutFromGameplay();