Allow user to select enter/space for keys

kazzmir · Aug 22, 2006 · 0910c86 · 0910c86
1 parent d11a9da
commit 0910c86
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/src/keyboard.cpp b/src/keyboard.cpp
@@ -27,6 +27,10 @@ const bool Keyboard::getAnyKey( int k1 ){
 const bool Keyboard::keyPressed(){
 	return ::keypressed();
 }
+
+void Keyboard::clear(){
+	::clear_keybuf();
+}
 
 const int Keyboard::readKey(){
 	if ( ! ::keypressed() ){

diff --git a/src/keyboard.h b/src/keyboard.h
@@ -13,6 +13,8 @@ namespace Keyboard{
 	const int readKey();
 	const bool keyPressed();
 
+	void clear();
+
 	std::string keyToString( int key );
 
 	extern const int A;

diff --git a/src/raptor.cpp b/src/raptor.cpp
@@ -403,7 +403,10 @@ int intro_screen( int & frames, SpaceObject ** player, DATAFILE * sound ){
 	current->init();
 
 	int option = -1;
-	while ( option != INIT_QUIT && option != INIT_CONTINUE && option != INIT_PLAY ) {
+	while ( option != INIT_QUIT &&
+		option != INIT_CONTINUE &&
+		option != INIT_PLAY ) {
+
 		Util::YIELD();
 		// al_poll_duh( dumb_player );
 		/*
@@ -552,6 +555,21 @@ int intro_screen( int & frames, SpaceObject ** player, DATAFILE * sound ){
 
 		}
 
+		/* wait for enter/space to be released
+		 * so the user doesnt get into a loop of selecting
+		 * enter or space for the key and then modifying
+		 * that key again
+		 */
+		if ( option == CHANGE_KEY_SHOOT ||
+                     option == CHANGE_KEY_FORWARD ||
+                     option == CHANGE_KEY_BACKWARD ||
+                     option == CHANGE_KEY_LEFT ||
+                     option == CHANGE_KEY_RIGHT ){
+			while ( Keyboard::getAnyKey( Keyboard::SPACE, Keyboard::ENTER ) ){
+				Util::YIELD();
+			}
+		}
+
 		/*
 		if ( changed_frames ) {
 			free( numnum );