summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/minesweep/minefield.cpp144
-rw-r--r--noncore/games/minesweep/minefield.h7
-rw-r--r--noncore/games/minesweep/minesweep.cpp34
3 files changed, 110 insertions, 75 deletions
diff --git a/noncore/games/minesweep/minefield.cpp b/noncore/games/minesweep/minefield.cpp
index 04cfb97..1790110 100644
--- a/noncore/games/minesweep/minefield.cpp
+++ b/noncore/games/minesweep/minefield.cpp
@@ -1,6 +1,6 @@
/**********************************************************************
-** Copyright (C) 2000 Trolltech AS. All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
**
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
**
** This file may be distributed and/or modified under the terms of the
@@ -20,5 +20,6 @@
#include "minefield.h"
-#include <qpe/config.h>
+#include <qtopia/config.h>
+#include <qtopia/qpeapplication.h>
#include <qpainter.h>
@@ -70,5 +71,5 @@ static const char *pix_mine[]={
static const int maxGrid = 28;
-static const int minGrid = 9;
+static const int minGrid = 12;
@@ -185,26 +186,34 @@ void Mine::paint( QPainter* p, const QColorGroup &cg, const QRect& cr )
int x = cr.x();
int y = cr.y();
- if ( !knownField ) {
+ if ( !knownField || knownField->width() != cr.width() ||
+ knownField->height() != cr.height() ) {
+ delete knownField;
knownField = new QPixmap( cr.width(), cr.height() );
QPainter pp( knownField );
QBrush br( cg.button().dark(115) );
- qDrawWinButton( &pp, cr, cg, TRUE, &br );
+ qDrawWinButton( &pp, QRect( 0, 0, cr.width(), cr.height() ), cg, TRUE, &br );
}
const int pmmarg=cr.width()/5;
- if ( !unknownField ) {
+ if ( !unknownField || unknownField->width() != cr.width() ||
+ unknownField->height() != cr.height() ) {
+ delete unknownField;
unknownField = new QPixmap( cr.width(), cr.height() );
QPainter pp( unknownField );
QBrush br( cg.button() );
- qDrawWinButton( &pp, cr, cg, FALSE, &br );
+ qDrawWinButton( &pp, QRect( 0, 0, cr.width(), cr.height() ), cg, FALSE, &br );
}
- if ( !flag_pix ) {
+ if ( !flag_pix || flag_pix->width() != cr.width()-pmmarg*2 ||
+ flag_pix->height() != cr.height()-pmmarg*2 ) {
+ delete flag_pix;
flag_pix = new QPixmap( cr.width()-pmmarg*2, cr.height()-pmmarg*2 );
flag_pix->convertFromImage( QImage(pix_flag).smoothScale(cr.width()-pmmarg*2, cr.height()-pmmarg*2) );
}
- if ( !mine_pix ) {
+ if ( !mine_pix || mine_pix->width() != cr.width()-pmmarg*2 ||
+ mine_pix->height() != cr.height()-pmmarg*2 ) {
+ delete mine_pix;
mine_pix = new QPixmap( cr.width()-pmmarg*2, cr.height()-pmmarg*2 );
mine_pix->convertFromImage( QImage(pix_mine).smoothScale(cr.width()-pmmarg*2, cr.height()-pmmarg*2) );
@@ -284,8 +293,9 @@ MineField::MineField( QWidget* parent, const char* name )
: QScrollView( parent, name )
{
+ viewport()->setBackgroundMode( NoBackground );
setState( GameOver );
setSizePolicy( QSizePolicy( QSizePolicy::Maximum, QSizePolicy::Maximum ) );
-
+
setFocusPolicy( QWidget::NoFocus );
@@ -300,18 +310,14 @@ MineField::MineField( QWidget* parent, const char* name )
nonminecount=0;
cellSize = -1;
- mines = 0;
+
+ numRows = numCols = 0;
+ mines = NULL;
}
MineField::~MineField()
{
- int i;
- if ( mines )
- {
- for ( i = 0; i < numCols*numRows; i++ )
- {
- delete mines[i];
- }
- delete[] mines;
- }
+ for ( int i = 0; i < numCols*numRows; i++ )
+ delete mines[i];
+ delete[] mines;
}
@@ -328,12 +334,7 @@ void MineField::setup( int level )
int i;
- if ( mines )
- {
- for ( i = 0; i < numCols*numRows; i++ )
- {
- delete mines[i];
- }
- delete[] mines;
- }
+ for ( i = 0; i < numCols*numRows; i++ )
+ delete mines[i];
+ delete[] mines;
switch( lev ) {
@@ -344,7 +345,7 @@ void MineField::setup( int level )
break;
case 2:
- numRows = 16;
- numCols = 16;
- minecount = 45;
+ numRows = 13;
+ numCols = 13;
+ minecount = 33;
break;
case 3:
@@ -354,9 +355,9 @@ void MineField::setup( int level )
break;
}
- mines = new Mine*[numRows*numCols];
+ mines = new Mine* [numRows*numCols];
for ( i = 0; i < numCols*numRows; i++ )
mines[i] = new Mine( this );
-
+
nonminecount = numRows*numCols - minecount;
mineguess = minecount;
@@ -372,5 +373,5 @@ void MineField::setup( int level )
}
-void MineField::drawContents( QPainter * p, int clipx, int clipy, int clipw, int cliph )
+void MineField::drawContents( QPainter * p, int clipx, int clipy, int clipw, int cliph )
{
int c1 = clipx / cellSize;
@@ -378,5 +379,5 @@ void MineField::drawContents( QPainter * p, int clipx, int clipy, int clipw, int
int r1 = clipy / cellSize;
int r2 = ( clipy + cliph - 1 ) / cellSize;
-
+
for ( int c = c1; c <= c2 ; c++ ) {
for ( int r = r1; r <= r2 ; r++ ) {
@@ -398,5 +399,9 @@ void MineField::setAvailableRect( const QRect &r )
availableRect = r;
int newCellSize = findCellSize();
- if ( newCellSize != cellSize ) {
+
+
+ if ( newCellSize == cellSize ) {
+ setCellSize( cellSize );
+ } else {
viewport()->setUpdatesEnabled( FALSE );
setCellSize( newCellSize );
@@ -408,8 +413,8 @@ void MineField::setAvailableRect( const QRect &r )
int MineField::findCellSize()
{
- int w = availableRect.width() - 1;
- int h = availableRect.height() - 1;
+ int w = availableRect.width() - 2;
+ int h = availableRect.height() - 2;
int cellsize;
-
+
cellsize = QMIN( w/numCols, h/numRows );
cellsize = QMIN( QMAX( cellsize, minGrid ), maxGrid );
@@ -420,19 +425,27 @@ int MineField::findCellSize()
void MineField::setCellSize( int cellsize )
{
- cellSize = cellsize;
-
- int w = availableRect.width();
- int h = availableRect.height();
-
+ int b = 2;
+
int w2 = cellsize*numCols;
int h2 = cellsize*numRows;
-
- resizeContents( w2, h2 );
-
- int b = 5;
-
- setGeometry( availableRect.x() + (w-w2)/2, availableRect.y() + (h-h2)/2,
- w2+b, h2+b );
-// QMIN(w,w2+b), QMIN(h,h2+b) );
+
+ int w = QMIN( availableRect.width(), w2+b );
+ int h = QMIN( availableRect.height(), h2+b );
+
+ //
+ // Don't rely on the change in cellsize to force a resize,
+ // as it's possible to have the same size cells when going
+ // from a large play area to a small one.
+ //
+ resizeContents(w2, h2);
+
+ if ( availableRect.height() < h2 &&
+ availableRect.width() - w > style().scrollBarExtent().width() ) {
+ w += style().scrollBarExtent().width();
+ }
+
+ setGeometry( availableRect.x() + (availableRect.width()-w)/2,
+ availableRect.y() + (availableRect.height()-h)/2, w, h );
+ cellSize = cellsize;
}
@@ -614,8 +627,12 @@ void MineField::updateMine( int row, int col )
if ( flagAction != NoAction ) {
if ( m->state() == Mine::Flagged ) {
- --mineguess;
- emit mineCount( mineguess );
- if ( m->isMined() )
- --minecount;
+ if (mineguess > 0) {
+ --mineguess;
+ emit mineCount( mineguess );
+ if ( m->isMined() )
+ --minecount;
+ } else {
+ m->setState(Mine::Hidden);
+ }
} else if ( wasFlagged ) {
++mineguess;
@@ -682,9 +699,10 @@ void MineField::readConfig(Config& cfg)
currRow = currCol = 0;
QString grid = cfg.readEntry("Grid");
+ int x;
if ( !grid.isEmpty() ) {
int i=0;
minecount=0;
mineguess=0;
- for ( int x = 0; x < numCols; x++ ) {
+ for ( x = 0; x < numCols; x++ ) {
for ( int y = 0; y < numRows; y++ ) {
char code='A'+(x*17+y*101)%21; // Reduce the urge to cheat
@@ -712,5 +730,5 @@ void MineField::readConfig(Config& cfg)
}
}
- for ( int x = 0; x < numCols; x++ ) {
+ for ( x = 0; x < numCols; x++ ) {
for ( int y = 0; y < numRows; y++ ) {
Mine* m = mine( y, x );
@@ -724,2 +742,10 @@ void MineField::readConfig(Config& cfg)
}
+QSize MineField::sizeHint() const
+{
+ if ( qApp->desktop()->width() >= 240 )
+ return QSize(200,200);
+ else
+ return QSize(160, 160);
+}
+
diff --git a/noncore/games/minesweep/minefield.h b/noncore/games/minesweep/minefield.h
index 1349c35..e243d77 100644
--- a/noncore/games/minesweep/minefield.h
+++ b/noncore/games/minesweep/minefield.h
@@ -1,6 +1,6 @@
/**********************************************************************
-** Copyright (C) 2000 Trolltech AS. All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
**
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
**
** This file may be distributed and/or modified under the terms of the
@@ -43,4 +43,7 @@ public:
void setAvailableRect( const QRect & );
+
+ QSize sizeHint() const;
+
public slots:
void setup( int level );
diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp
index 7214a73..d707dab 100644
--- a/noncore/games/minesweep/minesweep.cpp
+++ b/noncore/games/minesweep/minesweep.cpp
@@ -1,6 +1,6 @@
/**********************************************************************
-** Copyright (C) 2000 Trolltech AS. All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
**
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
**
** This file may be distributed and/or modified under the terms of the
@@ -22,9 +22,9 @@
#include "minefield.h"
-#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
+#include <qtopia/qpeapplication.h>
+#include <qtopia/resource.h>
+#include <qtopia/config.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
#include <qmenubar.h>
#include <qpopupmenu.h>
@@ -199,4 +199,5 @@ void ResultIndicator::center()
QPoint pp = w->mapToGlobal( QPoint(0,0) );
QSize s = sizeHint()*3;
+ s.setWidth( QMIN(s.width(), w->width()) );
pp = QPoint( pp.x() + w->width()/2 - s.width()/2,
pp.y() + w->height()/ 2 - s.height()/2 );
@@ -225,6 +226,9 @@ class MineFrame : public QFrame
public:
MineFrame( QWidget *parent, const char *name = 0 )
- :QFrame( parent, name ) {}
- void setField( MineField *f ) { field = f; }
+ :QFrame( parent, name ), field(0) {}
+ void setField( MineField *f ) {
+ field = f;
+ setMinimumSize( field->sizeHint() );
+ }
protected:
void resizeEvent( QResizeEvent *e ) {
@@ -241,8 +245,8 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
: QMainWindow( parent, name, f )
{
- QPEApplication::setInputMethodHint(this, QPEApplication::AlwaysOff );
srand(::time(0));
setCaption( tr("Mine Hunt") );
- setIcon( Resource::loadPixmap( "minesweep_icon" ) );
+ QPEApplication::setInputMethodHint(this, QPEApplication::AlwaysOff );
+ setIcon( Resource::loadPixmap( "minesweep/MineHunt" ) );
QToolBar *toolBar = new QToolBar( this );
@@ -254,5 +258,8 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
gameMenu->insertItem( tr("Beginner"), this, SLOT( beginner() ) );
gameMenu->insertItem( tr("Advanced"), this, SLOT( advanced() ) );
- gameMenu->insertItem( tr("Expert"), this, SLOT( expert() ) );
+
+ if (qApp->desktop()->width() >= 240) {
+ gameMenu->insertItem( tr("Expert"), this, SLOT( expert() ) );
+ }
menuBar->insertItem( tr("Game"), gameMenu );
@@ -300,10 +307,9 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
setCentralWidget( mainframe );
- connect( field, SIGNAL( gameOver( bool ) ), this, SLOT( gameOver( bool ) ) );
- connect( field, SIGNAL( mineCount( int ) ), this, SLOT( setCounter( int ) ) );
+ connect( field, SIGNAL( gameOver(bool) ), this, SLOT( gameOver(bool) ) );
+ connect( field, SIGNAL( mineCount(int) ), this, SLOT( setCounter(int) ) );
connect( field, SIGNAL( gameStarted()), this, SLOT( startPlaying() ) );
timer = new QTimer( this );
-
connect( timer, SIGNAL( timeout() ), this, SLOT( updateTime() ) );