From 8c35a5d5cba72aa7b79f6c7f14ac3e985abab6a7 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Thu, 23 Jun 2005 03:14:01 +0000 Subject: [PATCH] fix VC7.1 warnings --- stepmania/src/Background.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp index b9da228f87..7ffb33727a 100644 --- a/stepmania/src/Background.cpp +++ b/stepmania/src/Background.cpp @@ -378,8 +378,8 @@ bool BackgroundImpl::Layer::CreateBackground( const Song *pSong, const Backgroun // Set Lua color globals - LUA->SetGlobal( ssprintf("Color%d",1), bd.m_sColor1.empty() ? "1,1,1,1" : bd.m_sColor1 ); - LUA->SetGlobal( ssprintf("Color%d",2), bd.m_sColor2.empty() ? "1,1,1,1" : bd.m_sColor2 ); + LUA->SetGlobal( ssprintf("Color%d",1), bd.m_sColor1.empty() ? CString("1,1,1,1") : bd.m_sColor1 ); + LUA->SetGlobal( ssprintf("Color%d",2), bd.m_sColor2.empty() ? CString("1,1,1,1") : bd.m_sColor2 ); // Resolve the effect file. @@ -801,8 +801,8 @@ void BackgroundImpl::Layer::UpdateCurBGChange( const Song *pSong, float fLastMus m_pCurrentBGA->SetUpdateRate( change.m_fRate ); // Set Lua color globals before calling Init and On - LUA->SetGlobal( ssprintf("Color%d",1), change.m_def.m_sColor1.empty() ? "1,1,1,1" : change.m_def.m_sColor1 ); - LUA->SetGlobal( ssprintf("Color%d",2), change.m_def.m_sColor2.empty() ? "1,1,1,1" : change.m_def.m_sColor2 ); + LUA->SetGlobal( ssprintf("Color%d",1), change.m_def.m_sColor1.empty() ? CString("1,1,1,1") : change.m_def.m_sColor1 ); + LUA->SetGlobal( ssprintf("Color%d",2), change.m_def.m_sColor2.empty() ? CString("1,1,1,1") : change.m_def.m_sColor2 ); m_pCurrentBGA->PlayCommand( "Init" ); m_pCurrentBGA->PlayCommand( "On" );