From 32f829d42cf01b4c348f02fd9058560d81e0d829 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 2 Feb 2005 05:57:26 +0000
Subject: [PATCH] cleanup (never compare DeviceI.button against KEY_* unless
 you first check that it's a keyboard)

---
 stepmania/src/RageInputDevice.cpp | 14 ++++++++++++++
 stepmania/src/ScreenTextEntry.cpp | 23 +----------------------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/stepmania/src/RageInputDevice.cpp b/stepmania/src/RageInputDevice.cpp
index 10752b7acf..e1d8860c88 100644
--- a/stepmania/src/RageInputDevice.cpp
+++ b/stepmania/src/RageInputDevice.cpp
@@ -264,6 +264,20 @@ char DeviceInput::ToChar() const
 	case DEVICE_KEYBOARD:
 		if( button < 128 )
 			return (char) button;
+
+		if( button >= KEY_KP_C0 && button <= KEY_KP_C9 )
+			return (char) (button - KEY_KP_C0) + '0';
+
+		switch( button )
+		{
+		case KEY_KP_SLASH: return '/';
+		case KEY_KP_ASTERISK: return '*';
+		case KEY_KP_HYPHEN: return '-';
+		case KEY_KP_PLUS: return '+';
+		case KEY_KP_PERIOD: return '.';
+		case KEY_KP_EQUAL: return '=';
+		}
+
 		return '\0';
 	default:
 		return '\0';
diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp
index 046689a37c..f5c9356ead 100644
--- a/stepmania/src/ScreenTextEntry.cpp
+++ b/stepmania/src/ScreenTextEntry.cpp
@@ -182,28 +182,7 @@ void ScreenTextEntry::Input( const DeviceInput& DeviceI, const InputEventType ty
 			case '/':	c='?';	break;
 			}
 		}
-
-		//In the event we are using the numpad...
-		switch ( DeviceI.button )
-		{
-			case KEY_KP_C0:		c='0'; break;
-			case KEY_KP_C1:		c='1'; break;
-			case KEY_KP_C2:		c='2'; break;
-			case KEY_KP_C3:		c='3'; break;
-			case KEY_KP_C4:		c='4'; break;
-			case KEY_KP_C5:		c='5'; break;
-			case KEY_KP_C6:		c='6'; break;
-			case KEY_KP_C7:		c='7'; break;
-			case KEY_KP_C8:		c='8'; break;
-			case KEY_KP_C9:		c='9'; break;
-			case KEY_KP_SLASH:	c='/'; break;
-			case KEY_KP_ASTERISK: c='*'; break;
-			case KEY_KP_HYPHEN: c='-'; break;
-			case KEY_KP_PLUS:	c='+'; break;
-			case KEY_KP_PERIOD: c='.'; break;
-			case KEY_KP_EQUAL:	c='='; break;
-		}
-		
+	
 		if( c >= ' ' )
 		{
 			m_sAnswer += c;