From f116a3f4e8a0d685f535414fbdd2fbcc9d4897d5 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 25 Jan 2004 15:45:50 +0000
Subject: [PATCH] cleanup

---
 stepmania/src/CodeDetector.cpp | 9 ++++++---
 stepmania/src/CodeDetector.h   | 2 +-
 stepmania/src/InputQueue.cpp   | 6 ++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/CodeDetector.cpp b/stepmania/src/CodeDetector.cpp
index 94fbfe19d9..7478724e6e 100644
--- a/stepmania/src/CodeDetector.cpp
+++ b/stepmania/src/CodeDetector.cpp
@@ -69,6 +69,8 @@ CodeItem g_CodeItems[CodeDetector::NUM_CODES];
 
 bool CodeItem::EnteredCode( GameController controller ) const
 {
+	if( controller == GAME_CONTROLLER_INVALID )
+		return false;
 	if( buttons.size() == 0 )
 		return false;
 
@@ -97,7 +99,7 @@ bool CodeItem::EnteredCode( GameController controller ) const
 	}
 }
 
-void CodeItem::Load( CString sButtonsNames )
+bool CodeItem::Load( CString sButtonsNames )
 {
 	buttons.clear();
 
@@ -127,7 +129,7 @@ void CodeItem::Load( CString sButtonsNames )
 	{
 		if( sButtonsNames != "" )
 			LOG->Trace( "The code '%s' is less than 2 buttons, so it will be ignored.", sButtonsNames.c_str() );
-		return;
+		return false;
 	}
 
 	for( unsigned i=0; i<asButtonNames.size(); i++ )	// for each button in this code
@@ -140,7 +142,7 @@ void CodeItem::Load( CString sButtonsNames )
 		{
 			LOG->Trace( "The code '%s' contains an unrecognized button '%s'.", sButtonsNames.c_str(), sButtonName.c_str() );
 			buttons.clear();
-			return;
+			return false;
 		}
 
 		buttons.push_back( gb );
@@ -162,6 +164,7 @@ void CodeItem::Load( CString sButtonsNames )
 	}
 
 	// if we make it here, we found all the buttons in the code
+	return true;
 }
 
 bool CodeDetector::EnteredCode( GameController controller, Code code )
diff --git a/stepmania/src/CodeDetector.h b/stepmania/src/CodeDetector.h
index 0441c1f842..40c36b2f07 100644
--- a/stepmania/src/CodeDetector.h
+++ b/stepmania/src/CodeDetector.h
@@ -16,7 +16,7 @@
 struct CodeItem
 {
 public:
-	void Load( CString sButtonsNames );
+	bool Load( CString sButtonsNames );
 	bool EnteredCode( GameController controller ) const;
 
 private:
diff --git a/stepmania/src/InputQueue.cpp b/stepmania/src/InputQueue.cpp
index e96b4c78d0..11d33b36bf 100644
--- a/stepmania/src/InputQueue.cpp
+++ b/stepmania/src/InputQueue.cpp
@@ -37,6 +37,9 @@ void InputQueue::RememberInput( const GameInput GameI )
 
 bool InputQueue::MatchesSequence( GameController c, const MenuButton* button_sequence, const int iNumButtons, float fMaxSecondsBack )
 {
+	if( c == GAME_CONTROLLER_INVALID )
+		return false;
+
 	if( fMaxSecondsBack == -1 )
 		fMaxSecondsBack = 0.4f + iNumButtons*0.15f;
 
@@ -66,6 +69,9 @@ bool InputQueue::MatchesSequence( GameController c, const MenuButton* button_seq
 
 bool InputQueue::MatchesSequence( GameController c, const GameButton* button_sequence, const int iNumButtons, float fMaxSecondsBack )
 {
+	if( c == GAME_CONTROLLER_INVALID )
+		return false;
+
 	float fOldestTimeAllowed = RageTimer::GetTimeSinceStart() - fMaxSecondsBack;
 
 	int sequence_index = iNumButtons-1;	// count down