From f39c970c43b3815947e902d73194fa19dd1eedfe Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 6 Jun 2005 18:30:12 +0000 Subject: [PATCH] better error --- stepmania/src/InputFilter.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stepmania/src/InputFilter.cpp b/stepmania/src/InputFilter.cpp index 6a3c4193db..73b03d9246 100644 --- a/stepmania/src/InputFilter.cpp +++ b/stepmania/src/InputFilter.cpp @@ -2,6 +2,7 @@ #include "InputFilter.h" #include "RageLog.h" #include "RageInput.h" +#include "RageUtil.h" #include "RageThreads.h" @@ -55,8 +56,8 @@ void InputFilter::ButtonPressed( DeviceInput di, bool Down ) if( di.ts.IsZero() ) LOG->Warn( "InputFilter::ButtonPressed: zero timestamp is invalid" ); - ASSERT( di.device < NUM_INPUT_DEVICES ); - ASSERT( di.button < GetNumDeviceButtons(di.device) ); + ASSERT_M( di.device < NUM_INPUT_DEVICES, ssprintf("dev %i,%i", di.device, NUM_INPUT_DEVICES) ); + ASSERT_M( di.button < GetNumDeviceButtons(di.device), ssprintf("button %i,%i", di.button, GetNumDeviceButtons(di.device)) ); ButtonState &bs = m_ButtonState[di.device][di.button]; bs.m_Level = di.level;