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

HandleMessage( Message )

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-13 23:11:25 +00:00
parent c219f56a3b
commit a5f5fa0b78
28 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+2 -2
View File
@@ -1215,9 +1215,9 @@ void Actor::SetParent( Actor *pParent )
LUA->Release( L );
}
void Actor::HandleMessage( const RString& sMessage )
void Actor::HandleMessage( const Message &msg )
{
PlayCommand( sMessage );
PlayCommand( msg.GetName() );
}
Actor::TweenInfo::TweenInfo()
stepmania/src/Actor.h
+1 -1
View File
@@ -365,7 +365,7 @@ public:
//
// Messages
//
virtual void HandleMessage( const RString& sMessage );
virtual void HandleMessage( const Message &msg );
//
// Animation
stepmania/src/HoldJudgment.cpp
+3 -3
View File
@@ -77,13 +77,13 @@ void HoldJudgment::LoadFromMultiPlayer( MultiPlayer mp )
this->SubscribeToMessage( enum_add2(Message_ShowHoldJudgmentMuliPlayerP1,m_mpToTrack) );
}
void HoldJudgment::HandleMessage( const RString &sMessage )
void HoldJudgment::HandleMessage( const Message &msg )
{
ASSERT( m_mpToTrack != MultiPlayer_Invalid );
if( sMessage == MessageToString( enum_add2(Message_ShowHoldJudgmentMuliPlayerP1,m_mpToTrack) ) )
if( msg == enum_add2(Message_ShowHoldJudgmentMuliPlayerP1,m_mpToTrack) )
SetHoldJudgment( STATSMAN->m_CurStageStats.m_multiPlayer[m_mpToTrack].hnsLast );
ActorFrame::HandleMessage( sMessage );
ActorFrame::HandleMessage( msg );
}
// lua start
stepmania/src/HoldJudgment.h
+1 -1
View File
@@ -16,7 +16,7 @@ public:
void SetHoldJudgment( HoldNoteScore hns );
void LoadFromMultiPlayer( MultiPlayer mp );
void HandleMessage( const RString &sMessage );
void HandleMessage( const Message &msg );
//
// Lua
stepmania/src/Judgment.cpp
+3 -3
View File
@@ -105,12 +105,12 @@ void Judgment::LoadFromMultiPlayer( MultiPlayer mp )
this->SubscribeToMessage( enum_add2(Message_ShowJudgmentMuliPlayerP1,m_mpToTrack) );
}
void Judgment::HandleMessage( const RString &sMessage )
void Judgment::HandleMessage( const Message &msg )
{
if( m_mpToTrack != MultiPlayer_Invalid && sMessage == MessageToString( enum_add2(Message_ShowJudgmentMuliPlayerP1,m_mpToTrack) ) )
if( m_mpToTrack != MultiPlayer_Invalid && msg == enum_add2(Message_ShowJudgmentMuliPlayerP1,m_mpToTrack) )
SetJudgment( STATSMAN->m_CurStageStats.m_multiPlayer[m_mpToTrack].tnsLast, false ); // FIXME: save and pass early bool?
ActorFrame::HandleMessage( sMessage );
ActorFrame::HandleMessage( msg );
}
stepmania/src/Judgment.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
void LoadFromNode( const XNode* pNode );
void Reset();
void SetJudgment( TapNoteScore score, bool bEarly );
void HandleMessage( const RString &sMessage );
void HandleMessage( const Message &msg );
//
// Lua
stepmania/src/MusicSortDisplay.cpp
+3 -3
View File
@@ -22,12 +22,12 @@ void MusicSortDisplay::Set( SortOrder so )
Load( THEME->GetPathG("MusicSortDisplay",SortOrderToString(so)) );
}
void MusicSortDisplay::HandleMessage( const RString& sMessage )
void MusicSortDisplay::HandleMessage( const Message &msg )
{
if( sMessage == "SortOrderChanged" )
if( msg == "SortOrderChanged" )
Set( GAMESTATE->m_SortOrder );
Sprite::HandleMessage( sMessage );
Sprite::HandleMessage( msg );
}
/*
stepmania/src/MusicSortDisplay.h
+1 -1
View File
@@ -12,7 +12,7 @@ public:
MusicSortDisplay();
virtual MusicSortDisplay *Copy() const;
void Set( SortOrder so );
virtual void HandleMessage( const RString& sMessage );
virtual void HandleMessage( const Message &msg );
protected:
stepmania/src/MusicWheelItem.cpp
+8 -8
View File
@@ -301,17 +301,17 @@ void MusicWheelItem::RefreshGrades()
}
}
void MusicWheelItem::HandleMessage( const RString& sMessage )
void MusicWheelItem::HandleMessage( const Message &msg )
{
if( sMessage == MessageToString(Message_CurrentStepsP1Changed) ||
sMessage == MessageToString(Message_CurrentStepsP2Changed) ||
sMessage == MessageToString(Message_CurrentTrailP1Changed) ||
sMessage == MessageToString(Message_CurrentTrailP2Changed) ||
sMessage == MessageToString(Message_PreferredDifficultyP1Changed) ||
sMessage == MessageToString(Message_PreferredDifficultyP2Changed) )
if( msg == Message_CurrentStepsP1Changed ||
msg == Message_CurrentStepsP2Changed ||
msg == Message_CurrentTrailP1Changed ||
msg == Message_CurrentTrailP2Changed ||
msg == Message_PreferredDifficultyP1Changed ||
msg == Message_PreferredDifficultyP2Changed )
RefreshGrades();
Actor::HandleMessage( sMessage );
Actor::HandleMessage( msg );
}
/*
stepmania/src/MusicWheelItem.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
virtual MusicWheelItem *Copy() const { return new MusicWheelItem(*this); }
virtual void LoadFromWheelItemData( const WheelItemBaseData* pWID );
virtual void HandleMessage( const RString& sMessage );
virtual void HandleMessage( const Message &msg );
void RefreshGrades();
const WheelItemData *data;
stepmania/src/OptionRow.cpp
+1 -1
View File
@@ -874,7 +874,7 @@ void OptionRow::Reload()
//}
}
void OptionRow::HandleMessage( const RString& sMessage )
void OptionRow::HandleMessage( const Message &msg )
{
Reload();
}
stepmania/src/OptionRow.h
+1 -1
View File
@@ -124,7 +124,7 @@ public:
//
// Messages
//
virtual void HandleMessage( const RString& sMessage );
virtual void HandleMessage( const Message &msg );
protected:
RString GetRowTitle() const;
stepmania/src/ScreenEdit.cpp
+3 -3
View File
@@ -2367,13 +2367,13 @@ void ScreenEdit::ScrollTo( float fDestinationBeat )
m_soundChangeLine.Play();
}
void ScreenEdit::HandleMessage( const RString &sMessage )
void ScreenEdit::HandleMessage( const Message &msg )
{
if( sMessage == MessageToString(Message_SongModified) )
if( msg == Message_SongModified )
{
SetDirty( true );
}
Screen::HandleMessage( sMessage );
Screen::HandleMessage( msg );
}
static LocalizedString SAVE_SUCCESSFUL ( "ScreenEdit", "Save successful." );
stepmania/src/ScreenEdit.h
+1 -1
View File
@@ -179,7 +179,7 @@ public:
void InputRecord( const InputEventPlus &input, EditButton EditB );
void InputRecordPaused( const InputEventPlus &input, EditButton EditB );
void InputPlay( const InputEventPlus &input, EditButton EditB );
virtual void HandleMessage( const RString& sMessage );
virtual void HandleMessage( const Message &msg );
virtual void HandleScreenMessage( const ScreenMessage SM );
void SetDirty( bool bDirty ) { m_bDirty = bDirty; }
stepmania/src/ScreenMapControllers.cpp
+3 -3
View File
@@ -468,14 +468,14 @@ void ScreenMapControllers::Refresh()
m_LineScroller.SetDestinationItem( (float) m_iCurButton );
}
void ScreenMapControllers::HandleMessage( const RString& sMessage )
void ScreenMapControllers::HandleMessage( const Message &msg )
{
if( sMessage == MessageToString(Message_AutoJoyMappingApplied) )
if( msg == Message_AutoJoyMappingApplied )
{
Refresh();
}
ScreenWithMenuElements::HandleMessage( sMessage );
ScreenWithMenuElements::HandleMessage( msg );
}
stepmania/src/ScreenMapControllers.h
+1 -1
View File
@@ -22,7 +22,7 @@ public:
virtual void TweenOffScreen();
private:
virtual void HandleMessage( const RString& sMessage );
virtual void HandleMessage( const Message &msg );
Actor *GetActorWithFocus();
void BeforeChangeFocus();
stepmania/src/ScreenOptionsEditCourse.cpp
+3 -3
View File
@@ -335,9 +335,9 @@ void ScreenOptionsEditCourse::ProcessMenuStart( const InputEventPlus &input )
}
void ScreenOptionsEditCourse::HandleMessage( const RString& sMessage )
void ScreenOptionsEditCourse::HandleMessage( const Message &msg )
{
if( sMessage == "EditCourseDifficultyChanged" )
if( msg == "EditCourseDifficultyChanged" )
{
const vector<PlayerNumber> vpns( 1, GAMESTATE->m_MasterPlayerNumber );
OptionRow &row = *m_pRows[EditCourseRow_Meter];
@@ -345,7 +345,7 @@ void ScreenOptionsEditCourse::HandleMessage( const RString& sMessage )
ImportOptions( EditCourseRow_Meter, vpns );
row.AfterImportOptions( GAMESTATE->m_MasterPlayerNumber );
}
ScreenOptionsEditCourseSubMenu::HandleMessage( sMessage );
ScreenOptionsEditCourseSubMenu::HandleMessage( msg );
}
int ScreenOptionsEditCourse::GetCourseEntryIndexWithFocus() const
stepmania/src/ScreenOptionsEditCourse.h
+1 -1
View File
@@ -19,7 +19,7 @@ protected:
virtual void AfterChangeRow( PlayerNumber pn );
virtual void AfterChangeValueInRow( int iRow, PlayerNumber pn );
virtual void ProcessMenuStart( const InputEventPlus &input );
virtual void HandleMessage( const RString& sMessage );
virtual void HandleMessage( const Message &msg );
int GetCourseEntryIndexWithFocus() const;
stepmania/src/ScreenOptionsMemoryCard.cpp
+2 -2
View File
@@ -129,9 +129,9 @@ void ScreenOptionsMemoryCard::AfterChangeRow( PlayerNumber pn )
}
}
void ScreenOptionsMemoryCard::HandleMessage( const RString& sMessage )
void ScreenOptionsMemoryCard::HandleMessage( const Message &msg )
{
if( sMessage == MessageToString(Message_StorageDevicesChanged) )
if( msg == Message_StorageDevicesChanged )
{
if( !m_Out.IsTransitioning() )
{
stepmania/src/ScreenOptionsMemoryCard.h
+1 -1
View File
@@ -21,7 +21,7 @@ private:
void ImportOptions( int iRow, const vector<PlayerNumber> &vpns );
void ExportOptions( int iRow, const vector<PlayerNumber> &vpns );
void HandleMessage( const RString& sMessage );
void HandleMessage( const Message &msg );
void ProcessMenuStart( const InputEventPlus &input );
stepmania/src/ScreenSelect.cpp
+2 -2
View File
@@ -249,11 +249,11 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
Screen::HandleScreenMessage( SM );
}
void ScreenSelect::HandleMessage( const RString &sMessage )
void ScreenSelect::HandleMessage( const Message &msg )
{
this->UpdateSelectableChoices();
Screen::HandleMessage( sMessage );
Screen::HandleMessage( msg );
}
void ScreenSelect::MenuBack( const InputEventPlus &input )
stepmania/src/ScreenSelect.h
+1 -1
View File
@@ -19,7 +19,7 @@ public:
virtual void DrawPrimitives();
virtual void Input( const InputEventPlus &input );
virtual void HandleScreenMessage( const ScreenMessage SM );
virtual void HandleMessage( const RString &sMessage );
virtual void HandleMessage( const Message &msg );
virtual void MenuBack( const InputEventPlus &input );
stepmania/src/ScreenSystemLayer.cpp
+7 -7
View File
@@ -175,20 +175,20 @@ RString ScreenSystemLayer::GetCreditsMessage( PlayerNumber pn ) const
}
}
void ScreenSystemLayer::HandleMessage( const RString &sMessage )
void ScreenSystemLayer::HandleMessage( const Message &msg )
{
bool bJoinedMessage = false;
FOREACH_PlayerNumber( pn )
if( MessageToString(enum_add2(Message_SideJoinedP1, pn)) == sMessage )
if( msg == enum_add2(Message_SideJoinedP1, pn) )
bJoinedMessage = true;
if( sMessage == "RefreshCreditText" || sMessage == "CoinInserted" || bJoinedMessage )
if( msg == "RefreshCreditText" || msg == "CoinInserted" || bJoinedMessage )
{
// update joined
FOREACH_PlayerNumber( pn )
m_textCredits[pn].SetText( GetCreditsMessage(pn) );
}
else if( sMessage == "SystemMessage" )
else if( msg == "SystemMessage" )
{
m_sprMessageFrame->SetHidden( false );
m_sprMessageFrame->PlayCommand( "On" );
@@ -199,7 +199,7 @@ void ScreenSystemLayer::HandleMessage( const RString &sMessage )
m_textMessage.PlayCommand( "On" );
m_textMessage.PlayCommand( "Off" );
}
else if( sMessage == "SystemMessageNoAnimate" )
else if( msg == "SystemMessageNoAnimate" )
{
m_sprMessageFrame->SetHidden( false );
m_sprMessageFrame->PlayCommand( "On" );
@@ -212,13 +212,13 @@ void ScreenSystemLayer::HandleMessage( const RString &sMessage )
m_textMessage.FinishTweening();
m_textMessage.PlayCommand( "Off" );
}
else if( sMessage == "HideSystemMessage" )
else if( msg == "HideSystemMessage" )
{
m_sprMessageFrame->SetHidden( true );
m_textMessage.SetHidden( true );
}
Screen::HandleMessage( sMessage );
Screen::HandleMessage( msg );
}
void ScreenSystemLayer::Update( float fDeltaTime )
stepmania/src/ScreenSystemLayer.h
+1 -1
View File
@@ -14,7 +14,7 @@ class ScreenSystemLayer : public Screen
{
public:
virtual void Init();
void HandleMessage( const RString &sCommandName );
void HandleMessage( const Message &msg );
void ReloadCreditsText();
void Update( float fDeltaTime );
stepmania/src/ScreenTitleMenu.cpp
+2 -2
View File
@@ -89,9 +89,9 @@ void ScreenTitleMenu::Input( const InputEventPlus &input )
ScreenSelectMaster::Input( input );
}
void ScreenTitleMenu::HandleMessage( const RString& sMessage )
void ScreenTitleMenu::HandleMessage( const Message &msg )
{
if( sMessage == PREFSMAN->m_CoinMode.GetName()+"Changed" )
if( msg == PREFSMAN->m_CoinMode.GetName()+"Changed" )
{
/* If the CoinMode was changed, we need to reload this screen
* so that the right m_aGameCommands will show */
stepmania/src/ScreenTitleMenu.h
+1 -1
View File
@@ -14,7 +14,7 @@ public:
virtual void Input( const InputEventPlus &input );
virtual void HandleMessage( const RString& sMessage );
virtual void HandleMessage( const Message &msg );
protected:
RageSound m_soundSelectPressed;
stepmania/src/ScreenUnlockBrowse.cpp
+4 -4
View File
@@ -43,7 +43,7 @@ void ScreenUnlockBrowse::BeginScreen()
{
ScreenSelectMaster::BeginScreen();
HandleMessage( MessageToString(Message_MenuSelectionChanged) );
HandleMessage( Message(MessageToString(Message_MenuSelectionChanged)) );
}
void ScreenUnlockBrowse::MenuStart( const InputEventPlus &input )
@@ -64,9 +64,9 @@ void ScreenUnlockBrowse::TweenOffScreen()
ScreenSelectMaster::TweenOffScreen();
}
void ScreenUnlockBrowse::HandleMessage( const RString& sMessage )
void ScreenUnlockBrowse::HandleMessage( const Message &msg )
{
if( sMessage == MessageToString(Message_MenuSelectionChanged) )
if( msg == Message_MenuSelectionChanged )
{
int iSelection = this->GetSelectionIndex(PLAYER_1);
const UnlockEntry &ue = UNLOCKMAN->m_UnlockEntries[ iSelection ];
@@ -76,7 +76,7 @@ void ScreenUnlockBrowse::HandleMessage( const RString& sMessage )
m_banner.LoadBannerFromUnlockEntry( &ue );
}
ScreenSelectMaster::HandleMessage( sMessage );
ScreenSelectMaster::HandleMessage( msg );
}
/*
stepmania/src/ScreenUnlockBrowse.h
+1 -1
View File
@@ -13,7 +13,7 @@ public:
virtual void TweenOnScreen();
virtual void TweenOffScreen();
virtual void HandleMessage( const RString& sMessage );
virtual void HandleMessage( const Message &msg );
protected:
FadingBanner m_banner;