Upgraded to v1.7 - new menu system, new game types (gates (implemented and working) and fly (not implemented yet)). Also, high scores are persistent and different across game types - not difficultiy yet. Game Difficulty levels added but not yet implemented

2 files changed, 371 insertions, 45 deletions

diff --git a/noncore/games/sfcave/sfcave.cpp b/noncore/games/sfcave/sfcave.cpp
index 931f393..8b9c844 100644
--- a/noncore/games/sfcave/sfcave.cpp
+++ b/noncore/games/sfcave/sfcave.cpp
@@ -5,4 +5,5 @@
 #ifdef QWS
 #include <qpe/qpeapplication.h>
+#include <qpe/config.h>
 #else
 #include <qapplication.h>
@@ -11,7 +12,53 @@
 #include "sfcave.h"
 
-#define CAPTION "SFCave 1.6 by AndyQ"
+#define CAPTION "SFCave 1.7 by AndyQ"
+
+// States
+#define STATE_BOSS              0
+#define STATE_RUNNING           1
+#define STATE_CRASHED           2
+#define STATE_NEWGAME           3
+#define STATE_MENU              4
+
+// Menus
+#define MENU_MAIN_MENU          0
+#define MENU_OPTIONS_MENU       1
+
+// Main Menu Options
+#define MENU_START_GAME         0
+#define MENU_OPTIONS            1
+#define MENU_QUIT               2
+
+// Option Menu Options
+#define MENU_GAME_TYPE          0
+#define MENU_GAME_DIFFICULTY     1
+#define MENU_BACK               2
+
+QString SFCave::menuOptions[2][5] = { { "Start Game", "Options", "Quit", "", "" },
+                                    { "Game Type - %s", "Game Difficulty - %s", "Back", "", "" } };
+
+
+#define NR_GAME_DIFFICULTIES    3
+#define NR_GAME_TYPES           3
+
+#define EASY                    "Easy"
+#define NORMAL                  "Normal"
+#define HARD                    "Hard"
+
+#define SFCAVE_GAME_TYPE        0
+#define GATES_GAME_TYPE         1
+#define FLY_GAME_TYPE           2
+#define SFCAVE_GAME             "SFCave"
+#define GATES_GAME              "Gates"
+#define FLY_GAME                "Fly"
+QString SFCave::dificultyOption[] = { EASY, NORMAL, HARD };
+QString SFCave::gameTypes[] = { SFCAVE_GAME, GATES_GAME, FLY_GAME };
+
+#define CURRENT_GAME_TYPE       gameTypes[currentGameType]
+#define CURRENT_GAME_DIFFICULTY difficultyOption[currentGameDifficulty];
+
 bool movel;
 
+
 int main( int argc, char *argv[] )
 {
@@ -34,5 +81,5 @@ int main( int argc, char *argv[] )
 	}
 
-	Main app( speed );
+    SFCave app( speed );
 	a.setMainWidget( &app );
 	app.show();
@@ -41,6 +88,7 @@ int main( int argc, char *argv[] )
 }
 
-Main :: Main( int spd, QWidget *w, char *name )
+SFCave :: SFCave( int spd, QWidget *w, char *name )
 	: QMainWindow( w, name )
+
 {
 #ifdef QWS
@@ -54,10 +102,24 @@ Main :: Main( int spd, QWidget *w, char *name )
 	segSize = sWidth/(MAPSIZE-1)+1;
 
-//	printf( "width %d, height %d\n", sWidth, sHeight );
-//	printf( "segSize = %d\n", segSize );
+    currentMenuNr = 0;
+    nrMenuOptions[0] = 3;
+    nrMenuOptions[1] = 3;
+    currentMenuOption[0] = 0;
+    currentMenuOption[1] = 0;
+    currentGameType = 0;
+    currentGameDifficulty = 0;
 
 	setCaption( CAPTION );
 
-	highestScore = 0;
+#ifdef QWS
+    Config cfg( "sfcave" );
+    cfg.setGroup( "settings" );
+    QString key = "highScore_";
+    highestScore[SFCAVE_GAME_TYPE] = cfg.readNumEntry( key + SFCAVE_GAME, 0 );
+    highestScore[GATES_GAME_TYPE] = cfg.readNumEntry( key + GATES_GAME, 0 );
+    highestScore[FLY_GAME_TYPE] = cfg.readNumEntry( key + FLY_GAME, 0 );
+    currentGameType = cfg.readNumEntry( "gameType", 0 );
+    currentGameDifficulty = cfg.readNumEntry( "difficulty", 0 );
+#endif
 	speed = spd; // Change to 2 for PC
 	press = false;
@@ -74,9 +136,9 @@ Main :: Main( int spd, QWidget *w, char *name )
 }
 
-Main :: ~Main()
+SFCave :: ~SFCave()
 {
 }
 
-void Main :: start()
+void SFCave :: start()
 {
     gameTimer->start( 10 );
@@ -84,13 +146,13 @@ void Main :: start()
 }
 
-int Main :: nextInt( int range )
+int SFCave :: nextInt( int range )
 {
 	return rand() % range;
 }
 
-void Main :: setUp()
+void SFCave :: setUp()
 {
-	state = STATE_CRASHED;
-	prevState = STATE_CRASHED;
+    state = STATE_MENU;
+    prevState = STATE_MENU;
 
 	score = 0;
@@ -106,4 +168,7 @@ void Main :: setUp()
 	blockWidth = 20;
 	blockHeight = 70;
+    gapHeight = 125;
+    gateDistance = 75;
+    nextGate = nextInt( 50 ) + gateDistance;
 
 	for ( int i = 0 ; i < TRAILSIZE ; ++i )
@@ -121,5 +186,5 @@ void Main :: setUp()
 }
 
-void Main :: run()
+void SFCave :: run()
 {
 	//running = true;
@@ -127,4 +192,7 @@ void Main :: run()
 		switch ( state )
 		{
+            case STATE_MENU:
+                displayMenu();
+                break;
 			case STATE_NEWGAME:
 				setUp();
@@ -147,5 +215,9 @@ void Main :: run()
 					handleKeys();
 
-				if ( ++nrFrames % 500 == 0 )
+                // Apply Game rules
+                nrFrames ++;
+                if ( CURRENT_GAME_TYPE == SFCAVE_GAME )
+                {
+                    if ( nrFrames % 500 == 0 )
 				{
 					if ( maxHeight < sHeight - 100 )
@@ -161,10 +233,37 @@ void Main :: run()
 				if ( nrFrames % 100 == 0 )
 					addBlock();
+                }
+                else if ( CURRENT_GAME_TYPE == GATES_GAME )
+                {
+                    // Slightly random gap distance
+                    if ( nrFrames >= nextGate )
+                    {
+                        nextGate = nrFrames + nextInt( 50 ) + gateDistance;
+                        addGate();
+                    }
+
+                    if ( nrFrames % 500 == 0 )
+                    {
+                        if ( gapHeight > 75 )
+                            gapHeight -= 5;
+                    }
+                }
+                else if ( CURRENT_GAME_TYPE == FLY_GAME )
+                {
+                }
+                    
 
-	//			if ( false )
 				if ( checkCollision() )
 				{
-					if ( score > highestScore )
-						highestScore = score;
+                    if ( score > highestScore[currentGameType] )
+                        highestScore[currentGameType] = score;
+
+#ifdef QWS
+    Config cfg( "sfcave" );
+    cfg.setGroup( "settings" );
+    QString key = "highScore_";
+    key += CURRENT_GAME_TYPE;
+    cfg.writeEntry( key, highestScore[currentGameType] );
+#endif
 
 					state = STATE_CRASHED;
@@ -183,5 +282,5 @@ void Main :: run()
 }
 
-bool Main :: checkCollision()
+bool SFCave :: checkCollision()
 {
 	if ( (user.y() + user.width()) >= mapBottom[10] || user.y() <= mapTop[10] )
@@ -199,5 +298,5 @@ bool Main :: checkCollision()
 }
 
-void Main :: moveLandscape()
+void SFCave :: moveLandscape()
 {
 	offset++;
@@ -227,5 +326,5 @@ void Main :: moveLandscape()
 }
 
-void Main :: addBlock()
+void SFCave :: addBlock()
 {
 	for ( int i = 0 ; i < BLOCKSIZE ; ++i )
@@ -238,7 +337,34 @@ void Main :: addBlock()
 
 			blocks[i].setRect( x, y, blockWidth, blockHeight );
-//			printf( "Added block @ %d %d\n", x, y );
-//			printf( "mapTop = %d, mapBottom = %d", mapTop[50], mapBottom[50] );
 
+            break;
+        }
+    }
+}
+
+void SFCave :: addGate()
+{
+    for ( int i = 0 ; i < BLOCKSIZE ; ++i )
+    {
+        if ( blocks[i].y() == -1 )
+        {
+            int x1 = sWidth;
+            int y1 = mapTop[50];
+            int b1Height = nextInt(mapBottom[50] - mapTop[50] - gateDistance);
+
+            // See if height between last gate and this one is too big
+            if ( b1Height - 200 > lastGateBottomY )
+                b1Height -= 25;
+            else if ( b1Height + 200 < lastGateBottomY )
+                b1Height += 25;
+            lastGateBottomY = b1Height;
+
+            int x2 = sWidth;
+            int y2 = y1 + b1Height + gateDistance;
+            int b2Height = mapBottom[50] - y2;
+            
+
+            blocks[i].setRect( x1, y1, blockWidth, b1Height );
+            blocks[i+1].setRect( x2, y2, blockWidth, b2Height );
 
 			break;
@@ -247,5 +373,5 @@ void Main :: addBlock()
 }
 
-void Main :: setPoint( int point )
+void SFCave :: setPoint( int point )
 {
 	if ( nextInt(100) >= 80 )
@@ -268,5 +394,5 @@ void Main :: setPoint( int point )
 }
 
-void Main :: drawBoss()
+void SFCave :: drawBoss()
 {
 	offscreen->fill( Qt::black );
@@ -275,5 +401,5 @@ void Main :: drawBoss()
 }
 
-void Main :: draw()
+void SFCave :: draw()
 {
 	//printf( "Paint\n" );
@@ -281,4 +407,5 @@ void Main :: draw()
 
 	QPainter p( offscreen );
+    QFontMetrics fm = p.fontMetrics();
 	p.setPen( Qt::white );
 
@@ -307,5 +434,5 @@ void Main :: draw()
 	// draw score
 	QString s;
-	s.sprintf( "score %06d   high score %06d", score, highestScore );
+    s.sprintf( "score %06d   high score %06d", score, highestScore[currentGameType] );
 	p.drawText( 5, 10, s );
 
@@ -325,5 +452,12 @@ void Main :: draw()
 
         if ( crashLineLength >= 15 || crashLineLength == -1 )
-            p.drawText( 70, 140, QString( "Press down to start" ) );
+        {
+            QString text = "Press up or down to start";
+            p.drawText( (sWidth/2) - (fm.width( text )/2), 140, text );
+
+            text = "or press OK for menu";
+            p.drawText( (sWidth/2) - (fm.width( text )/2), 155, text );
+//           p.drawText( 70, 140, QString( "Press down to start" ) );
+        }
         else
             crashLineLength ++;
@@ -335,5 +469,5 @@ void Main :: draw()
 }
 
-void Main :: handleKeys()
+void SFCave :: handleKeys()
 {
 	// Find enpty trail and move others
@@ -383,5 +517,65 @@ void Main :: handleKeys()
 }
 
-void Main :: keyPressEvent( QKeyEvent *e )
+void SFCave :: keyPressEvent( QKeyEvent *e )
+{
+    if ( state == STATE_MENU )
+    {
+        switch( e->key() )
+        {
+            case Qt::Key_Down:
+                currentMenuOption[currentMenuNr] ++;
+                if ( menuOptions[currentMenuNr][currentMenuOption[currentMenuNr]] == "" )
+                    currentMenuOption[currentMenuNr] = 0;
+                break;
+            case Qt::Key_Up:
+                currentMenuOption[currentMenuNr] --;
+                if ( currentMenuOption[currentMenuNr] < 0 )
+                    currentMenuOption[currentMenuNr] = nrMenuOptions[currentMenuNr]-1;
+                break;
+
+            case Qt::Key_Left:
+                if ( currentMenuNr == MENU_OPTIONS_MENU )
+                {
+                    if ( currentMenuOption[currentMenuNr] == MENU_GAME_TYPE )
+                    {
+                        currentGameType --;
+                        if ( currentGameType < 0 )
+                            currentGameType = NR_GAME_TYPES - 1;
+                    }
+                    else if ( currentMenuOption[currentMenuNr] == MENU_GAME_DIFFICULTY )
+                    {
+                        currentGameDifficulty --;
+                        if ( currentGameDifficulty < 0 )
+                            currentGameDifficulty = NR_GAME_DIFFICULTIES - 1;
+                    }
+                }
+                break;
+
+            case Qt::Key_Right:
+                if ( currentMenuNr == MENU_OPTIONS_MENU )
+                {
+                    if ( currentMenuOption[currentMenuNr] == MENU_GAME_TYPE )
+                    {
+                        currentGameType ++;
+                        if ( currentGameType == NR_GAME_TYPES )
+                            currentGameType = 0;
+                    }
+                    else if ( currentMenuOption[currentMenuNr] == MENU_GAME_DIFFICULTY )
+                    {
+                        currentGameDifficulty ++;
+                        if ( currentGameDifficulty == NR_GAME_DIFFICULTIES )
+                            currentGameDifficulty = 0;
+                    }
+                }
+                break;
+
+            case Qt::Key_Space:
+            case Qt::Key_Return:
+            case Qt::Key_Enter:
+                dealWithMenuSelection();
+                break;
+        }
+    }
+    else
 {
    switch( e->key() )
@@ -392,4 +586,9 @@ void Main :: keyPressEvent( QKeyEvent *e )
             press = true;
             break;
+            case Qt::Key_M:
+            case Qt::Key_Return:
+            case Qt::Key_Enter:
+                if ( state == STATE_CRASHED && crashLineLength >= 15 || crashLineLength == -1 )
+                    state = STATE_MENU;
        default:
             e->ignore();
@@ -397,14 +596,23 @@ void Main :: keyPressEvent( QKeyEvent *e )
 	}
 }
+}
 
-void Main :: keyReleaseEvent( QKeyEvent *e )
+void SFCave :: keyReleaseEvent( QKeyEvent *e )
+{
+    if ( state == STATE_MENU )
+    {
+    }
+    else
 {
    switch( e->key() )
     {
-        case Qt::Key_Up:
         case Qt::Key_F9:
         case Qt::Key_Space:
             press = false;
             break;
+
+            case Qt::Key_Up:
+                press = false;
+                
 		case Qt::Key_R:
 		case Qt::Key_Down:
@@ -415,4 +623,6 @@ void Main :: keyReleaseEvent( QKeyEvent *e )
 			else
 				movel = true;
+                break;
+
        default:
             e->ignore();
@@ -420,2 +630,104 @@ void Main :: keyReleaseEvent( QKeyEvent *e )
 	}
 }
+
+}
+
+void SFCave :: displayMenu()
+{
+    offscreen->fill( Qt::black );
+
+    QPainter p( offscreen );
+    p.setPen( Qt::white );
+
+    QFont f( "Helvetica", 16 );
+    p.setFont( f );
+
+    QFontMetrics fm = p.fontMetrics();
+
+    QString text = "SFCave";
+    p.drawText( (sWidth/2) - (fm.width( text )/2), 60, text );
+
+    text = "Written by Andy Qua";
+    p.drawText( (sWidth/2) - (fm.width( text )/2), 85, text );
+
+    // Draw options
+    int pos = 170;
+    for ( int i = 0 ; menuOptions[currentMenuNr][i] != "" ; ++i, pos += 25 )
+    {
+        if ( currentMenuOption[currentMenuNr] == i )
+            p.setPen( Qt::yellow );
+        else
+            p.setPen( Qt::white );
+
+        QString text;
+        if ( menuOptions[currentMenuNr][i].find( "%s" ) != -1 )
+        {
+            QString val;
+            if ( i == MENU_GAME_TYPE )
+                val = gameTypes[currentGameType];
+            else
+                val = dificultyOption[currentGameDifficulty];
+
+            text.sprintf( (const char *)menuOptions[currentMenuNr][i], (const char *)val );
+        }
+        else
+            text = menuOptions[currentMenuNr][i];
+
+        p.drawText( (sWidth/2) - (fm.width( text )/2), pos, text );
+    }
+
+    p.end();
+    bitBlt( this, 0, 0, offscreen, 0, 0, sWidth, sHeight, Qt::CopyROP, true );
+}
+
+void SFCave :: dealWithMenuSelection()
+{
+    switch( currentMenuNr )
+    {
+        case MENU_MAIN_MENU:
+        {
+            switch( currentMenuOption[currentMenuNr] )
+            {
+                case MENU_START_GAME:
+                    state = STATE_NEWGAME;
+                    break;
+
+                case MENU_OPTIONS:
+                    currentMenuNr = MENU_OPTIONS_MENU;
+                    currentMenuOption[currentMenuNr] = 0;
+                    break;
+
+                case MENU_QUIT:
+                    QApplication::exit();
+                    break;
+            }
+
+            break;
+        }
+
+        case MENU_OPTIONS_MENU:
+        {
+            switch( currentMenuOption[currentMenuNr] )
+            {
+                case MENU_GAME_TYPE:
+                    break;
+                
+                case MENU_GAME_DIFFICULTY:
+                    break;
+                    
+               case MENU_BACK:
+                    currentMenuNr = MENU_MAIN_MENU;
+
+#ifdef QWS
+                    Config cfg( "sfcave" );
+                    cfg.setGroup( "settings" );
+                    cfg.writeEntry( "difficulty", currentGameDifficulty );
+                    cfg.writeEntry( "gameType", currentGameType );
+#endif
+                    break;
+            }
+
+            break;
+        }
+    }      
+}
\ No newline at end of file
diff --git a/noncore/games/sfcave/sfcave.h b/noncore/games/sfcave/sfcave.h
index 18eeef9..b19d147 100644
--- a/noncore/games/sfcave/sfcave.h
+++ b/noncore/games/sfcave/sfcave.h
@@ -9,13 +9,8 @@
 
 #define MAPSIZE 52
-#define BLOCKSIZE 5
+#define BLOCKSIZE 6
 #define TRAILSIZE 30
 
-#define STATE_BOSS 0
-#define STATE_RUNNING 1
-#define STATE_CRASHED 2
-#define STATE_NEWGAME 3
-
-class Main : public QMainWindow
+class SFCave : public QMainWindow
 {
 Q_OBJECT
@@ -28,4 +23,5 @@ public:
 	int blockWidth;
 	int blockHeight;
+    int gapHeight;
 	int state;
 	int prevState;
@@ -33,15 +29,29 @@ public:
     int crashLineLength;
 
+    int gateDistance;
+    int nextGate;
+    int lastGateBottomY;
+    
+    static QString menuOptions[2][5];
+    int currentMenuNr;
+    int nrMenuOptions[2];
+    int currentMenuOption[2];
+
+    static QString dificultyOption[3];
+    static QString gameTypes[3];
+    int currentGameType;
+    int currentGameDifficulty;
+
 	QPixmap *offscreen;
 	QTimer *gameTimer;
 
 	int score;
-	int highestScore;
+	int highestScore[3];
 
-	int mapTop[52];
-	int mapBottom[52];
-	QRect blocks[5];
+	int mapTop[MAPSIZE];
+	int mapBottom[MAPSIZE];
+	QRect blocks[BLOCKSIZE];
 	QRect user;
-	QPoint trail[30];
+	QPoint trail[TRAILSIZE];
 
 	int offset;
@@ -56,6 +66,6 @@ public:
 	bool running;
 
-	Main( int speed = 3, QWidget *p = 0, char *name = 0 );
-	~Main();
+	SFCave( int speed = 3, QWidget *p = 0, char *name = 0 );
+	~SFCave();
 	void start();
 	int nextInt( int range );
@@ -64,4 +74,5 @@ public:
 	void moveLandscape();
 	void addBlock();
+	void addGate();
 	void setPoint( int point );
 	void drawBoss();
@@ -69,4 +80,7 @@ public:
 	void handleKeys();
 
+    void displayMenu();
+    void dealWithMenuSelection();
+
 	void keyPressEvent( QKeyEvent *e );
 	void keyReleaseEvent( QKeyEvent *e );