summaryrefslogtreecommitdiff
path: root/noncore/games/minesweep/minefield.cpp
Unidiff
Diffstat (limited to 'noncore/games/minesweep/minefield.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/games/minesweep/minefield.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/games/minesweep/minefield.cpp b/noncore/games/minesweep/minefield.cpp
index eca1a36..04cfb97 100644
--- a/noncore/games/minesweep/minefield.cpp
+++ b/noncore/games/minesweep/minefield.cpp
@@ -324,65 +324,65 @@ void MineField::setup( int level )
324{ 324{
325 lev = level; 325 lev = level;
326 setState( Waiting ); 326 setState( Waiting );
327 //viewport()->setUpdatesEnabled( FALSE ); 327 //viewport()->setUpdatesEnabled( FALSE );
328 328
329 int i; 329 int i;
330 if ( mines ) 330 if ( mines )
331 { 331 {
332 for ( i = 0; i < numCols*numRows; i++ ) 332 for ( i = 0; i < numCols*numRows; i++ )
333 { 333 {
334 delete mines[i]; 334 delete mines[i];
335 } 335 }
336 delete[] mines; 336 delete[] mines;
337 } 337 }
338 338
339 switch( lev ) { 339 switch( lev ) {
340 case 1: 340 case 1:
341 numRows = 9 ; 341 numRows = 9 ;
342 numCols = 9 ; 342 numCols = 9 ;
343 minecount = 12; 343 minecount = 12;
344 break; 344 break;
345 case 2: 345 case 2:
346 numRows = 16; 346 numRows = 16;
347 numCols = 16; 347 numCols = 16;
348 minecount = 45; 348 minecount = 45;
349 break; 349 break;
350 case 3: 350 case 3:
351 numCols = 18; 351 numCols = 18;
352 numRows = 18; 352 numRows = 18;
353 minecount = 66 ; 353 minecount = 66 ;
354 break; 354 break;
355 } 355 }
356 mines = new (Mine*)[numRows*numCols]; 356 mines = new Mine*[numRows*numCols];
357 for ( i = 0; i < numCols*numRows; i++ ) 357 for ( i = 0; i < numCols*numRows; i++ )
358 mines[i] = new Mine( this ); 358 mines[i] = new Mine( this );
359 359
360 360
361 nonminecount = numRows*numCols - minecount; 361 nonminecount = numRows*numCols - minecount;
362 mineguess = minecount; 362 mineguess = minecount;
363 emit mineCount( mineguess ); 363 emit mineCount( mineguess );
364 Mine::paletteChange(); 364 Mine::paletteChange();
365 365
366 if ( availableRect.isValid() ) 366 if ( availableRect.isValid() )
367 setCellSize(findCellSize()); 367 setCellSize(findCellSize());
368 // viewport()->setUpdatesEnabled( TRUE ); 368 // viewport()->setUpdatesEnabled( TRUE );
369 //viewport()->repaint( TRUE ); 369 //viewport()->repaint( TRUE );
370 updateContents( 0, 0, numCols*cellSize, numRows*cellSize ); 370 updateContents( 0, 0, numCols*cellSize, numRows*cellSize );
371 updateGeometry(); 371 updateGeometry();
372} 372}
373 373
374void MineField::drawContents( QPainter * p, int clipx, int clipy, int clipw, int cliph ) 374void MineField::drawContents( QPainter * p, int clipx, int clipy, int clipw, int cliph )
375{ 375{
376 int c1 = clipx / cellSize; 376 int c1 = clipx / cellSize;
377 int c2 = ( clipx + clipw - 1 ) / cellSize; 377 int c2 = ( clipx + clipw - 1 ) / cellSize;
378 int r1 = clipy / cellSize; 378 int r1 = clipy / cellSize;
379 int r2 = ( clipy + cliph - 1 ) / cellSize; 379 int r2 = ( clipy + cliph - 1 ) / cellSize;
380 380
381 for ( int c = c1; c <= c2 ; c++ ) { 381 for ( int c = c1; c <= c2 ; c++ ) {
382 for ( int r = r1; r <= r2 ; r++ ) { 382 for ( int r = r1; r <= r2 ; r++ ) {
383 int x = c * cellSize; 383 int x = c * cellSize;
384 int y = r * cellSize; 384 int y = r * cellSize;
385 Mine *m = mine( r, c ); 385 Mine *m = mine( r, c );
386 if ( m ) 386 if ( m )
387 m->paint( p, colorGroup(), QRect(x, y, cellSize, cellSize ) ); 387 m->paint( p, colorGroup(), QRect(x, y, cellSize, cellSize ) );
388 } 388 }