From 4f228d3a307d3f0b0d41c6b78d24cfe5d24f5e1b Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Thu, 18 Jan 2007 12:35:13 +0000 Subject: [PATCH] Use IsJoystick() and IsPump(). --- stepmania/src/archutils/Darwin/JoystickDevice.cpp | 6 +++--- stepmania/src/archutils/Darwin/PumpDevice.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stepmania/src/archutils/Darwin/JoystickDevice.cpp b/stepmania/src/archutils/Darwin/JoystickDevice.cpp index ca49e0a0d5..5ee79c700d 100644 --- a/stepmania/src/archutils/Darwin/JoystickDevice.cpp +++ b/stepmania/src/archutils/Darwin/JoystickDevice.cpp @@ -252,11 +252,11 @@ void JoystickDevice::GetButtonPresses( vector& vPresses, int cookie int JoystickDevice::AssignIDs( InputDevice startID ) { - if( startID < DEVICE_JOY1 || startID > DEVICE_JOY16 ) + if( !IsJoystick(startID) ) return -1; FOREACH( Joystick, m_vSticks, i ) { - if( startID > DEVICE_JOY16 ) + if( !IsJoystick(startID) ) { m_vSticks.erase( i, m_vSticks.end() ); break; @@ -274,7 +274,7 @@ void JoystickDevice::GetDevicesAndDescriptions( vector& vDevice } /* - * (c) 2005-2006 Steve Checkoway + * (c) 2005-2007 Steve Checkoway * All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/stepmania/src/archutils/Darwin/PumpDevice.cpp b/stepmania/src/archutils/Darwin/PumpDevice.cpp index 2f691b18fc..16938573d3 100644 --- a/stepmania/src/archutils/Darwin/PumpDevice.cpp +++ b/stepmania/src/archutils/Darwin/PumpDevice.cpp @@ -52,7 +52,7 @@ void PumpDevice::GetButtonPresses( vector& vPresses, int cookie, in int PumpDevice::AssignIDs( InputDevice startID ) { - if( startID < DEVICE_PUMP1 || startID > DEVICE_PUMP2 ) + if( !IsPump(startID) ) return -1; m_Id = startID; return 1;