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

merge/simplify

Browse Source
This commit is contained in:
Glenn Maynard
2006-12-18 22:06:23 +00:00
parent 276de65c4d
commit ef9bf1835e
6 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/InputHandler/InputHandler.cpp
+2 -6
View File
@@ -162,11 +162,7 @@ RString InputHandler::GetLocalizedInputString( const DeviceInput &di )
}
}
static DriverList g_pRegistrees;
RegisterInputHandler::RegisterInputHandler( const istring &sName, CreateRageDriverFn pfn )
{
g_pRegistrees.Add( sName, pfn );
}
DriverList InputHandler::m_pDriverList;
static LocalizedString INPUT_HANDLERS_EMPTY( "Arch", "Input Handlers cannot be empty." );
void InputHandler::Create( const RString &drivers_, vector<InputHandler *> &Add )
@@ -180,7 +176,7 @@ void InputHandler::Create( const RString &drivers_, vector<InputHandler *> &Add
FOREACH_CONST( RString, DriversToTry, s )
{
RageDriver *pDriver = g_pRegistrees.Create( *s );
RageDriver *pDriver = InputHandler::m_pDriverList.Create( *s );
if( pDriver == NULL )
{
LOG->Trace( "Unknown Input Handler name: %s", s->c_str() );
stepmania/src/arch/InputHandler/InputHandler.h
+2 -5
View File
@@ -27,6 +27,7 @@ class InputHandler: public RageDriver
{
public:
static void Create( const RString &sDrivers, vector<InputHandler *> &apAdd );
static DriverList m_pDriverList;
InputHandler() { m_iInputsSinceUpdate = 0; }
virtual ~InputHandler() { }
@@ -71,12 +72,8 @@ private:
int m_iInputsSinceUpdate;
};
struct RegisterInputHandler
{
RegisterInputHandler( const istring &sName, CreateRageDriverFn pfn );
};
#define REGISTER_INPUT_HANDLER_CLASS2( name, x ) \
static RegisterInputHandler register_##name( #name, CreateClass<InputHandler_##x, RageDriver> )
static RegisterRageDriver register_##name( &InputHandler::m_pDriverList, #name, CreateClass<InputHandler_##x, RageDriver> )
#define REGISTER_INPUT_HANDLER_CLASS( name ) REGISTER_INPUT_HANDLER_CLASS2( name, name )