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

use RString for ScreenMessage for easier debugging

Browse Source
This commit is contained in:
Chris Danford
2008-07-21 12:00:50 +00:00
parent 7b8b6f29e5
commit f36f6618fa
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Screen.cpp
+1 -1
View File
@@ -275,7 +275,7 @@ public:
static int PostScreenMessage( T* p, lua_State *L ) static int PostScreenMessage( T* p, lua_State *L )
{ {
RString sMessage = SArg(1); RString sMessage = SArg(1);
ScreenMessage SM = ScreenMessageHelpers::ToMessageNumber( sMessage ); ScreenMessage SM = ScreenMessageHelpers::ToScreenMessage( sMessage );
p->PostScreenMessage( SM, 0 ); p->PostScreenMessage( SM, 0 );
return 0; return 0;
} }
stepmania/src/ScreenMessage.cpp
+4 -4
View File
@@ -4,7 +4,7 @@
#include "Foreach.h" #include "Foreach.h"
#include <map> #include <map>
const ScreenMessage SM_Invalid = 999999; const ScreenMessage SM_Invalid = "";
AutoScreenMessage(SM_None); AutoScreenMessage(SM_None);
AutoScreenMessage(SM_MenuTimer); AutoScreenMessage(SM_MenuTimer);
AutoScreenMessage(SM_DoneFadingIn); AutoScreenMessage(SM_DoneFadingIn);
@@ -19,18 +19,18 @@ AutoScreenMessage(SM_Failure);
static map<RString, ScreenMessage> *m_pScreenMessages; static map<RString, ScreenMessage> *m_pScreenMessages;
ScreenMessage ScreenMessageHelpers::ToMessageNumber( const RString &sName ) ScreenMessage ScreenMessageHelpers::ToScreenMessage( const RString &sName )
{ {
if( m_pScreenMessages == NULL ) if( m_pScreenMessages == NULL )
m_pScreenMessages = new map<RString, ScreenMessage>; m_pScreenMessages = new map<RString, ScreenMessage>;
if( m_pScreenMessages->find( sName ) == m_pScreenMessages->end() ) if( m_pScreenMessages->find( sName ) == m_pScreenMessages->end() )
(*m_pScreenMessages)[sName] = (ScreenMessage) m_pScreenMessages->size(); (*m_pScreenMessages)[sName] = (ScreenMessage)sName;
return (*m_pScreenMessages)[sName]; return (*m_pScreenMessages)[sName];
} }
RString ScreenMessageHelpers::NumberToString( ScreenMessage SM ) RString ScreenMessageHelpers::ScreenMessageToString( ScreenMessage SM )
{ {
FOREACHM( RString, ScreenMessage, *m_pScreenMessages, it ) FOREACHM( RString, ScreenMessage, *m_pScreenMessages, it )
if( SM == it->second ) if( SM == it->second )
stepmania/src/ScreenMessage.h
+7 -7
View File
@@ -1,9 +1,9 @@
/* ScreenMessage - Definition of common ScreenMessages. */ /* ScreenMessage - Definition of common ScreenMessages and helpers. */
#ifndef SCREEN_MESSAGE_H #ifndef ScreenMessage_H
#define SCREEN_MESSAGE_H #define ScreenMessage_H
typedef int ScreenMessage; typedef RString ScreenMessage;
extern const ScreenMessage SM_Invalid; extern const ScreenMessage SM_Invalid;
extern const ScreenMessage SM_None; extern const ScreenMessage SM_None;
@@ -20,13 +20,13 @@ extern const ScreenMessage SM_Failure;
namespace ScreenMessageHelpers namespace ScreenMessageHelpers
{ {
ScreenMessage ToMessageNumber( const RString & Name ); ScreenMessage ToScreenMessage( const RString & Name );
RString NumberToString( ScreenMessage SM ); RString ScreenMessageToString( ScreenMessage SM );
}; };
// Automatically generate a unique ScreenMessage value // Automatically generate a unique ScreenMessage value
#define AutoScreenMessage( x ) \ #define AutoScreenMessage( x ) \
const ScreenMessage x = ScreenMessageHelpers::ToMessageNumber( #x ); const ScreenMessage x = ScreenMessageHelpers::ToScreenMessage( #x );
#endif #endif