Merge branch 'randomize'
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Tue, 14 Jun 2011 08:32:41 +0000 (11:32 +0300)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Tue, 14 Jun 2011 08:32:41 +0000 (11:32 +0300)
1  2 
mainwindow.cpp
seascene.cpp

diff --cc mainwindow.cpp
@@@ -73,9 -64,9 +72,9 @@@ void MainWindow::initializeBoundaries(
      pScene_->setSceneRect(rectangle);
      pView_->setSceneRect(rectangle);
  
-     qDebug() << "Initialized boundaries" << rectangle.left() << rectangle.right() << pView_->width();
+     qDebug() << "Initialized boundaries" << rectangle.right() << rectangle.bottom() << pView_->width() << pView_->height();
  
 -    pScene_->setupMap(5,5,5);
 +    pScene_->setupMap(11,5,5);
  }
  
  void MainWindow::pause(bool paused)
diff --cc seascene.cpp
Simple merge