1 files changed, 21 insertions, 25 deletions

diff --git a/noncore/games/sfcave-sdl/game.cpp b/noncore/games/sfcave-sdl/game.cpp
index a644696..e41e510 100644
--- a/noncore/games/sfcave-sdl/game.cpp
+++ b/noncore/games/sfcave-sdl/game.cpp
@@ -67,67 +67,71 @@ void Game :: init()
         player->init();
 }
 
 void Game :: handleKeys( SDL_KeyboardEvent &key )
 {
         if ( !replay && key.keysym.sym == SDLK_SPACE )
         {
                 if ( key.type == SDL_KEYDOWN )
                 {
                         if ( !press )
                                 replayList.push_back( nrFrames );
                         press = true;
-
-        //              if ( thrustChannel == -1 && parent->getState() == STATE_PLAYING )
-        //                      thrustChannel = SoundHandler :: playSound( SND_THRUST, -1, -1, false );
                 }
                 else
                 {
                         if ( press )
                                 replayList.push_back( nrFrames );
                         press = false;
 
-                        if ( thrustChannel != -1 )
-                        {
-        //                      SoundHandler :: stopSound( thrustChannel, true, 300 );
-        //                      thrustChannel = -1;
-                        }
                 }
         }
 }
 
 
 
-QString Game :: getGameDifficultyText()
+string Game :: getGameDifficultyText()
 {
-        QString ret;
+        string ret;
 
         if ( difficulty == MENU_DIFFICULTY_EASY )
                 ret =  "Easy";
         else if ( difficulty == MENU_DIFFICULTY_NORMAL )
                 ret = "Medium";
         else if ( difficulty == MENU_DIFFICULTY_HARD )
                 ret = "Hard";
+        else if ( difficulty == MENU_DIFFICULTY_CUSTOM )
+                ret = "Custom";
 
         return ret;
 }
 
 void Game :: setDifficulty( string diff )
 {
         if ( diff == "Easy" )
                 difficulty = MENU_DIFFICULTY_EASY;
         else if ( diff == "Medium" )
                 difficulty = MENU_DIFFICULTY_NORMAL;
         else if ( diff == "Hard" )
                 difficulty = MENU_DIFFICULTY_HARD;
+    else if ( diff == "Custom" )
+                difficulty = MENU_DIFFICULTY_CUSTOM;
+                
+    init();
+}
+
+void Game :: setDifficulty( int diff )
+{
+    difficulty = diff;
+    init();
 }
 
 void Game :: update( int state )
 {
         nrFrames ++;
 
         if ( score > highScore )
                 highScore = score;
 
 
         if ( state == STATE_PLAYING )
         {
@@ -157,32 +161,31 @@ void Game :: update( int state )
                         parent->changeState( STATE_CRASHED );
 
         }
 }
 
 void Game :: preDraw( SDL_Surface *screen )
 {
 }
 
 void Game :: draw( SDL_Surface *screen )
 {
         char tmp[100];
-        QString scoreText;
+        string scoreText;
         sprintf( tmp, "Score: %06ld   High Score: %06ld", score, highScore );
-        //printf( "%s\n", (const char *)scoreText );
         FontHandler::draw( screen, FONT_WHITE_TEXT, tmp, 3, 10 );
 
         if ( parent->getState() == STATE_CRASHED )
         {
-                QString crashText;
+                string crashText;
                 crashText = "Game Over";
                 int x = (240 - FontHandler::TextWidth( FONT_WHITE_TEXT, (const char *)crashText.c_str() )) / 2;
                 FontHandler::draw( screen, FONT_WHITE_TEXT, (const char *)crashText.c_str(), x, 150 );
 
                 int fontHeight = FontHandler::FontHeight( FONT_WHITE_TEXT );
                 crashText = "Press Middle Button to play again";
                 x = (240 - FontHandler::TextWidth( FONT_WHITE_TEXT, (const char *)crashText.c_str() )) / 2;
                 FontHandler::draw( screen, FONT_WHITE_TEXT, (const char *)crashText.c_str(), x, 150 + fontHeight );
 
                 crashText = "or OK for menu";
                 x = (240 - FontHandler::TextWidth( FONT_WHITE_TEXT, (const char *)crashText.c_str() )) / 2;
                 FontHandler::draw( screen, FONT_WHITE_TEXT, (const char *)crashText.c_str(), x, 150 + 2*fontHeight );
@@ -214,112 +217,105 @@ void Game :: stateChanged( int from, int to )
         }
 }
 
 void Game :: setSeed( int seed )
 {
     if ( seed == -1 )
         currentSeed = ((unsigned long) time((time_t *) NULL));
     else
         currentSeed = seed;
     PutSeed( currentSeed );
 }
 
-void Game :: saveReplay( QString file )
+void Game :: saveReplay( string file )
 {
     FILE *out;
     out = fopen( file.c_str(), "w" );
     if ( !out )
     {
         printf( "Couldn't write to /home/root/%s\n", file.c_str() );
                 parent->setMenuStatusText( "Couldn't save replay file" );
         return;
     }
 
     // Build up string of values
     // Format is:: <landscape seed> <game type> <difficulty> <framenr> <framenr>.......
-    QString val;
+    string val;
     char tmp[20];
     sprintf( tmp, "%d %d ", currentSeed, difficulty );
     val = tmp;
 
     list<int>::iterator it = replayList.begin();
     while( it != replayList.end() )
     {
         sprintf( tmp, "%d ", *it );
         val += tmp;
 
         it++;
     }
     val += "\n";
 
-    QString line;
+    string line;
     sprintf( tmp, "%d\n", val.length() );
     line = tmp;
     fwrite( line.c_str(), 1, line.length(), out );
 
     fwrite( val.c_str(), 1, val.length(), out );
 
     fclose( out );
-
-    printf( "Replay saved to %s\n", (const char *)file.c_str() );
-
 }
 
-void Game :: loadReplay( QString file )
+void Game :: loadReplay( string file )
 {
 
     FILE *in = fopen( (const char *)file.c_str(), "r" );
 
     if ( in == 0 )
     {
         printf( "Couldn't load replay file %s!\n", (const char *)file.c_str() );
                 parent->setMenuStatusText( "Couldn't load replay file" );
         return;
     }
 
     // Read next line - contains the size of the options
     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 );
-//    printf( "data - %s", data );
 
-    QString sep  = " ";
+    string sep  = " ";
 
     StringTokenizer st( data, sep );
 
     // print it out
     vector<string>::iterator it = st.begin();
     currentSeed = atoi( (*it).c_str() );
     ++it;
     difficulty = atoi( (*it).c_str() );
     ++it;
 
     replayList.clear();
     for ( ; it != st.end(); ++it )
     {
         int v = atoi( (*it).c_str() );
         replayList.push_back( v );
     }
 
     delete data;
 
     fclose( in );
-
-    printf( "Replay loaded from %s\n", (const char *)file.c_str() );
-
 }
 
 
 Game *Game :: createGame( SFCave *p, int w, int h, string game, string difficulty )
 {
         Game *g;
 
         if ( game == "SFCave" )
                 g = new SFCaveGame( p, w, h, 0 );
         else if ( game == "Gates" )
                 g = new GatesGame( p, w, h, 0 );
         else if ( game == "Fly" )