[Stepmania-cvs] =?utf-8?q?stepmania/src_RageInput=2Ecpp=2C1=2E104?= =?utf-8?b?LDEuMTA1IFJhZ2VJbnB1dC5oLDEuNTksMS42MA==?=

[Steve C. <ste...@us...>]

Update of /cvsroot/stepmania/stepmania/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv21720

Modified Files:
	RageInput.cpp RageInput.h 
Log Message:
Unscatter arch includes.


Index: RageInput.h
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/RageInput.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -p -r1.59 -r1.60
--- RageInput.h	15 Jun 2006 06:07:45 -0000	1.59
+++ RageInput.h	17 Nov 2006 18:25:16 -0000	1.60
@@ -31,7 +31,6 @@ public:
 
 private:
 	vector<InputHandler *> m_pDevices;
-	RString m_sDriverList;
 };
 
 extern RageInput*			INPUTMAN;	// global and accessable from anywhere in our program

Index: RageInput.cpp
===================================================================
RCS file: /cvsroot/stepmania/stepmania/src/RageInput.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -p -r1.104 -r1.105
--- RageInput.cpp	1 Nov 2006 10:45:47 -0000	1.104
+++ RageInput.cpp	17 Nov 2006 18:25:16 -0000	1.105
@@ -3,7 +3,6 @@
 #include "RageLog.h"
 #include "arch/InputHandler/InputHandler.h"
 #include "arch/arch.h"
-#include "arch/arch_default.h"
 #include "Foreach.h"
 #include "Preference.h"
 #include "LuaManager.h"
@@ -25,10 +24,6 @@ RageInput::RageInput()
 		LUA->Release( L );
 	}
 
-	m_sDriverList = g_sInputDrivers;
-	if( m_sDriverList.empty() )
-		m_sDriverList = DEFAULT_INPUT_DRIVER_LIST;
-
 	LoadDrivers();
 }
 
@@ -49,7 +44,7 @@ void RageInput::LoadDrivers()
 	m_pDevices.clear();
 
 	/* Init optional devices. */
-	MakeInputHandlers( m_sDriverList, m_pDevices );
+	MakeInputHandlers( g_sInputDrivers, m_pDevices );
 
 	/* If no input devices are loaded, the user won't be able to input anything. */
 	if( m_pDevices.size() == 0 )