GameState.cpp: GetSerialNumber() was already declared

MiscITG.cpp: "/Stats" does not exist in the VFS.  In fact, it doesn't exist anywhere...

Makefile.am: there is no need for account for LibUSB because ./configure will not return successfully if it is not there anyway

The following files need to be unversioned out: Makefile, Makefile.in, config.h, src/Makefile, src/Makefile.in, src/openitg, and src/GtkModule.so.  These are generated files (from ./configure or make) that are machine-dependant and should not be part of the SVN tree.  Run ./auto.sh and then ./configure to regenerate them.  This way, the files will not be changed every time you do an SVN update.  --infamouspat

git-svn-id: https://openitg.svn.sourceforge.net/svnroot/openitg@92 83fadc84-e282-4d84-a09a-c4228d6ae7e5

diff --git a/src/MiscITG.cpp b/src/MiscITG.cpp
index 6095d81..eec3b01 100644 (file)
--- a/src/MiscITG.cpp
+++ b/src/MiscITG.cpp
@@ -228,7 +228,7 @@ LuaFunction_NoArgs( GetNumIOErrors  , 0 ); // Call the number of I/O Errors [Scre
 LuaFunction_NoArgs( GetNumMachineScores, GetNumMachineScores() ); // Call the machine score count [ScreenArcadeDiagnostics]
 // added by infamouspat
 LuaFunction_NoArgs( GetSerialNumber, GetSerialNumber() ); // returns serial from page 9 on dongle
-LuaFunction_NoArgs( GetInputType, g_sInputType ); // grabs from RageInput's global variable
+LuaFunction_NoArgs( GetInputType, CString(g_sInputType) ); // grabs from RageInput's global variable
 LuaFunction_NoArgs( HubIsConnected, HubIsConnected() ); // well, is it?