Added check for no replay file on loading and fixed bugs where you could screw up the replay by pressing stuff

1 files changed, 11 insertions, 2 deletions

diff --git a/noncore/games/sfcave/sfcave.cpp b/noncore/games/sfcave/sfcave.cpp
index 93f5f82..d551afe 100644
--- a/noncore/games/sfcave/sfcave.cpp
+++ b/noncore/games/sfcave/sfcave.cpp
@@ -817,25 +817,25 @@ void SFCave :: keyPressEvent( QKeyEvent *e )
             case Qt::Key_Enter:
                 dealWithMenuSelection();
                 break;
         }
     }
     else
     {
         switch( e->key() )
         {
             case Qt::Key_Up:
             case Qt::Key_F9:
             case Qt::Key_Space:
-                if ( !press )
+                if ( !replay && !press )
                 {
                     press = true;
                     replayList.append( new int( nrFrames ) );
                 }
                 break;
             case Qt::Key_M:
             case Qt::Key_Return:
             case Qt::Key_Enter:
                 if ( state == STATE_CRASHED )
                     state = STATE_MENU;
                 break;
 
@@ -853,49 +853,51 @@ void SFCave :: keyPressEvent( QKeyEvent *e )
 void SFCave :: keyReleaseEvent( QKeyEvent *e )
 {
     if ( state == STATE_MENU )
     {
     }
     else
     {
         switch( e->key() )
         {
             case Qt::Key_F9:
             case Qt::Key_Space:
             case Qt::Key_Up:
-                if ( press )
+                if ( !replay && press )
                 {
                     press = false;
 
                     replayList.append( new int( nrFrames ) );
                 }
                 break;
 
             case Qt::Key_R:
                 if ( state == STATE_CRASHED )
                 {
                     state = STATE_REPLAY;
                 }
                 break;
 
             case Qt::Key_Down:
                 if ( state == STATE_CRASHED )
                     state = STATE_NEWGAME;
                 break;
 
             case Qt::Key_S:
+                if ( state == STATE_CRASHED )
                 saveReplay();
                 break;
 
             case Qt::Key_L:
+                if ( state == STATE_CRASHED )
                 loadReplay();
                 break;
            default:
                 e->ignore();
                 break;
         }
     }
 
 }
 
 void SFCave :: displayMenu()
 {
@@ -1056,24 +1058,29 @@ void SFCave :: saveReplay()
     fwrite( (const char *)val, 1, val.length(), out );
    
     fclose( out );
 
     printf( "Replay saved to %s\n", (const char *)replayFile );
 
 }
 
 void SFCave :: loadReplay()
 {
     FILE *in = fopen( (const char *)replayFile, "r" );
 
+    if ( in == 0 )
+    {
+        printf( "Couldn't load replay file!\n" );
+        return;
+    }   
     // Read size of next line
     char line[10+1];
     fgets( line, 10, in );
 
     int length = -1;
     sscanf( line, "%d", &length );
     char *data = new char[length+1];
 
     fread( data, 1, length, in );
 
     QString sep  = " ";
     QStringList list = QStringList::split( sep, QString( data ) );
@@ -1084,13 +1091,15 @@ void SFCave :: loadReplay()
     ++it;
 
     replayList.clear();
     for ( ; it != list.end(); ++it )
     {
         int v = (*it).toInt();
         replayList.append( new int( v ) );
     }
 
     delete data;
 
     fclose( in );
+    
+    printf( "Replay loaded from %s\n", (const char *)replayFile );
 }
\ No newline at end of file