From 464356151dfdb094707f50d5c9eb6a774b1e3abf Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 4 May 2007 18:15:26 +0000 Subject: [PATCH] better messages --- stepmania/src/MessageManager.cpp | 1 - stepmania/src/MessageManager.h | 1 - stepmania/src/StepMania.cpp | 10 ++++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/stepmania/src/MessageManager.cpp b/stepmania/src/MessageManager.cpp index bc6845e402..c07a8b44e0 100644 --- a/stepmania/src/MessageManager.cpp +++ b/stepmania/src/MessageManager.cpp @@ -51,7 +51,6 @@ static const char *MessageIDNames[] = { "MenuRightP1", "MenuRightP2", "MenuSelectionChanged", - "CoinInserted", "PlayerJoined", "PlayerUnjoined", "AutosyncChanged", diff --git a/stepmania/src/MessageManager.h b/stepmania/src/MessageManager.h index 2b138c2be5..2c9e00c1dc 100644 --- a/stepmania/src/MessageManager.h +++ b/stepmania/src/MessageManager.h @@ -48,7 +48,6 @@ enum MessageID Message_MenuRightP1, Message_MenuRightP2, Message_MenuSelectionChanged, - Message_CoinInserted, Message_PlayerJoined, Message_PlayerUnjoined, Message_AutosyncChanged, diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 6dba308c72..3d040a3c4a 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -1190,7 +1190,10 @@ void StepMania::InsertCoin( int iNum, bool bCountInBookkeeping ) GAMESTATE->m_iCoins += iNum; LOG->Trace("%i coins inserted, %i needed to play", GAMESTATE->m_iCoins, PREFSMAN->m_iCoinsPerCredit.Get() ); SCREENMAN->PlayCoinSound(); - MESSAGEMAN->Broadcast( Message_CoinInserted ); + Message msg( "CoinInserted" ); + msg.SetParam( "Coins", GAMESTATE->m_iCoins ); + msg.SetParam( "Inserted", iNum ); + MESSAGEMAN->Broadcast( msg ); } void StepMania::InsertCredit() @@ -1203,7 +1206,10 @@ void StepMania::ClearCredits() LOG->Trace("%i coins cleared", GAMESTATE->m_iCoins ); GAMESTATE->m_iCoins = 0; SCREENMAN->PlayInvalidSound(); - MESSAGEMAN->Broadcast( Message_CoinInserted ); + Message msg( "CoinInserted" ); + msg.SetParam( "Coins", GAMESTATE->m_iCoins ); + msg.SetParam( "Clear", true ); + MESSAGEMAN->Broadcast( msg ); } /* Returns true if the key has been handled and should be discarded, false if