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

cleanup, remove ASMHClass::LogMessageNumbers

Browse Source
This commit is contained in:
Glenn Maynard
2006-02-14 11:06:20 +00:00
parent 585ed24473
commit 205b8d6411
2 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenMessage.cpp
+11 -28
View File
@@ -1,49 +1,32 @@
#include "global.h" #include "global.h"
#include "ScreenMessage.h" #include "ScreenMessage.h"
#include "RageLog.h" #include "RageLog.h"
#include "Foreach.h"
ASMHClass AutoScreenMessageHandler; ASMHClass AutoScreenMessageHandler;
ScreenMessage ASMHClass::ToMessageNumber( const RString &Name ) ScreenMessage ASMHClass::ToMessageNumber( const RString &sName )
{ {
//If uninitilized, initilize the map. We KNOW it will be NULL if( m_pScreenMessages == NULL )
if ( m_pScreenMessages == NULL )
{ {
m_pScreenMessages = new map < RString, ScreenMessage >; m_pScreenMessages = new map<RString, ScreenMessage>;
m_iCurScreenMessage = SM_User; m_iCurScreenMessage = SM_User;
} }
//If the ScreenMessage doesn't exist yet, create it if( m_pScreenMessages->find( sName ) == m_pScreenMessages->end() )
if ( m_pScreenMessages->find( Name ) == m_pScreenMessages->end() )
{ {
m_iCurScreenMessage = ScreenMessage((int)m_iCurScreenMessage + 1); m_iCurScreenMessage = ScreenMessage((int)m_iCurScreenMessage + 1);
(*m_pScreenMessages)[ Name ] = m_iCurScreenMessage; (*m_pScreenMessages)[sName] = m_iCurScreenMessage;
} }
return (*m_pScreenMessages)[Name]; return (*m_pScreenMessages)[sName];
} }
void ASMHClass::LogMessageNumbers( ) RString ASMHClass::NumberToString( ScreenMessage SM ) const
{ {
map < RString, ScreenMessage >::iterator iter; FOREACHM( RString, ScreenMessage, *m_pScreenMessages, it )
if( SM == it->second )
//Log all ScreenMessages currently in the map return (*it).first;
LOG->Trace( "Current ScreenMessage: %d -- SM_User: %d", m_iCurScreenMessage, SM_User );
for ( iter = m_pScreenMessages->begin(); iter != m_pScreenMessages->end(); iter++ )
LOG->Trace( "ScreenMessage: %3d: %s", iter->second, (*iter).first.c_str() );
}
RString ASMHClass::NumberToString( ScreenMessage SM )
{
map < RString, ScreenMessage >::iterator iter;
//Log all ScreenMessages currently in the map
LOG->Trace( "Current ScreenMessage: %d -- SM_User: %d", m_iCurScreenMessage, SM_User );
for ( iter = m_pScreenMessages->begin(); iter != m_pScreenMessages->end(); iter++ )
if ( SM == iter->second )
return (*iter).first;
return RString(); return RString();
} }
stepmania/src/ScreenMessage.h
+3 -4
View File
@@ -46,15 +46,14 @@ enum ScreenMessage {
SM_Invalid = 999999 SM_Invalid = 999999
}; };
//AutoScreenMessageHandler Class
class ASMHClass class ASMHClass
{ {
public: public:
ScreenMessage ToMessageNumber( const RString & Name ); ScreenMessage ToMessageNumber( const RString & Name );
RString NumberToString( ScreenMessage SM ); RString NumberToString( ScreenMessage SM ) const;
void LogMessageNumbers();
private: private:
map < RString, ScreenMessage > *m_pScreenMessages; map<RString, ScreenMessage> *m_pScreenMessages;
ScreenMessage m_iCurScreenMessage; ScreenMessage m_iCurScreenMessage;
}; };