Fixed small bugette with cursor keys

1 files changed, 8 insertions, 11 deletions

diff --git a/noncore/games/sfcave/sfcave.cpp b/noncore/games/sfcave/sfcave.cpp
index 5633a8f..c1e4532 100644
--- a/noncore/games/sfcave/sfcave.cpp
+++ b/noncore/games/sfcave/sfcave.cpp
@@ -224,28 +224,25 @@ void SFCave :: setUp()
     score = 0;
     offset = 0;
     nrFrames = 0;
     dir = 1;
     thrust = 0;
 
-    int dist[] = { 100, 60, 40 };
     if ( CURRENT_GAME_TYPE == SFCAVE_GAME )
     {
         thrustUp = UpThrustVals[SFCAVE_GAME_TYPE][currentGameDifficulty];;
         noThrust = DownThrustVals[SFCAVE_GAME_TYPE][currentGameDifficulty];;
         maxUpThrust = MaxUpThrustVals[SFCAVE_GAME_TYPE][currentGameDifficulty];;
         maxDownThrust = MaxDownThrustVals[SFCAVE_GAME_TYPE][currentGameDifficulty];;
 
-        if ( currentCameDifficulty == DIFICULTY_EASY )
+        if ( currentGameDifficulty == DIFICULTY_EASY )
             gateDistance = 100;
-        else if ( currentCameDifficulty == DIFICULTY_EASY )
+        else if ( currentGameDifficulty == DIFICULTY_EASY )
             gateDistance = 60;
         else
             gateDistance = 40;
-            
-        printf( "GD = %d\n", gateDistance );
     }
     else if ( CURRENT_GAME_TYPE == GATES_GAME )
     {
         thrustUp = UpThrustVals[GATES_GAME_TYPE][currentGameDifficulty];;
         noThrust = DownThrustVals[GATES_GAME_TYPE][currentGameDifficulty];;
         maxUpThrust = MaxUpThrustVals[GATES_GAME_TYPE][currentGameDifficulty];;
@@ -788,17 +785,19 @@ void SFCave :: keyPressEvent( QKeyEvent *e )
     {
         switch( e->key() )
         {
             case Qt::Key_Up:
             case Qt::Key_F9:
             case Qt::Key_Space:
-                if ( !replay && !press )
+                if ( state == STATE_RUNNING && !replay && !press )
                 {
                     press = true;
                     replayList.append( new int( nrFrames ) );
                 }
+                else if ( state == STATE_CRASHED && e->key() == Key_Up )
+                    state = STATE_NEWGAME;
                 break;
             case Qt::Key_M:
             case Qt::Key_Return:
             case Qt::Key_Enter:
                 if ( state == STATE_CRASHED )
                 {
@@ -828,18 +827,16 @@ void SFCave :: keyReleaseEvent( QKeyEvent *e )
     {
         switch( e->key() )
         {
             case Qt::Key_F9:
             case Qt::Key_Space:
             case Qt::Key_Up:
-                if ( !replay && press )
-                {
-                    press = false;
-
+                press = false;
+                if ( state == STATE_RUNNING && !replay && press )
                     replayList.append( new int( nrFrames ) );
-                }
+
                 break;
 
             case Qt::Key_R:
                 if ( state == STATE_CRASHED )
                 {
                     state = STATE_REPLAY;