Fixed a bug in vibration effects and upped version number

Vibration effects no longer disappear when changing or restarting level.
Version is now 0.2.1.
Updated changelog and upgrade message in control.

diff --git a/main.cpp b/main.cpp
index 160ba1d..5274d07 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -27,7 +27,7 @@ int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     a.setApplicationName("Ghosts Overboard");
-    a.setApplicationVersion("0.2.0");
+    a.setApplicationVersion("0.2.1");
     MainWindow w;
 #if defined(Q_WS_S60)
     w.showMaximized();

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 58b3cfd..f30d851 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -64,11 +64,11 @@ MainWindow::MainWindow(QWidget *parent)
     connect(pRestartGameAction,SIGNAL(triggered()),this,SLOT(restartGame()));
     menuBar()->addAction(pRestartGameAction);
 
-    QAction * pVibrateAction = new QAction(tr("Vibration effects"),this);
-    pVibrateAction->setCheckable(true);
-    addAction(pVibrateAction);
-    connect(pVibrateAction,SIGNAL(triggered(bool)),pScene_,SLOT(vibrationActivate(bool)));
-    menuBar()->addAction(pVibrateAction);
+    pVibrateAction_ = new QAction(tr("Vibration effects"),this);
+    pVibrateAction_->setCheckable(true);
+    addAction(pVibrateAction_);
+    connect(pVibrateAction_,SIGNAL(triggered(bool)),pScene_,SLOT(vibrationActivate(bool)));
+    menuBar()->addAction(pVibrateAction_);
 
 
     QAction * pAboutAction = new QAction(tr("About"),this);
@@ -126,7 +126,9 @@ void MainWindow::initializeBoundaries()
 
 void MainWindow::restartLevel()
 {
-    pScene_->setupMap(levelList_.at(currentLevel_));
+    pScene_->setupMap(levelList_.value(currentLevel_));  //value() returns default constructor Level if index is invalid, so no risk of crash
+    pScene_->vibrationActivate(pVibrateAction_->isChecked());  //Vibration effects are lost without this
+   // qDebug() << pVibrateAction_->isChecked();
 }
 
 void MainWindow::about()
@@ -154,7 +156,7 @@ void MainWindow::nextLevel()
 
     if ( currentLevel_ < levelList_.size() )
     {
-        pScene_->setupMap(levelList_.at(currentLevel_));
+       restartLevel();
     }
 
     else //Victory!
@@ -243,6 +245,5 @@ bool MainWindow::event(QEvent *event)
 void MainWindow::restartGame()
 {
     currentLevel_ = 0;
-    pScene_->setupMap(levelList_.value(currentLevel_)); //value() returns default constructor Level, so no need to check if list empty
-
+    restartLevel();
 }

diff --git a/mainwindow.h b/mainwindow.h
index 91be672..5c2664c 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -55,6 +55,7 @@ QGraphicsView * pView_;
 QAction* pPauseAction_;
 QList<Level> levelList_;
 int currentLevel_;
+QAction* pVibrateAction_;
 
 
 };

diff --git a/qtc_packaging/debian_fremantle/changelog b/qtc_packaging/debian_fremantle/changelog
index 7ec47f4..eb85940 100644 (file)
--- a/qtc_packaging/debian_fremantle/changelog
+++ b/qtc_packaging/debian_fremantle/changelog
@@ -1,3 +1,9 @@
+ghostsoverboard (0.2.1) unstable; urgency=low
+
+  * vibration effects no longer disappear when level changes or is restarted
+
+ -- Heli Hyvättinen <helihyvattinen@kymp.net>  Wed, 13 July 2011 15:58:00 +0300
+
 ghostsoverboard (0.2.0) unstable; urgency=low
 
   * Octopuses (moving obstacles) added

diff --git a/qtc_packaging/debian_fremantle/control b/qtc_packaging/debian_fremantle/control
index 19d612b..7a9721c 100644 (file)
--- a/qtc_packaging/debian_fremantle/control
+++ b/qtc_packaging/debian_fremantle/control
@@ -13,9 +13,11 @@ Description: Pick up ghosts by tilting the device
  Save the ghosts from the sea back to their ghost ship. Watch for the rocks and the octopuses.
 XB-Maemo-Upgrade-Description: Pick up ghosts by tilting the device
  Save the ghosts from the sea back to their ghost ship. Watch for the rocks and the octopuses.
- New in this version:
+ New since version 0.1.0:
  four new levels with octopuses
  vibration effects (off by default)
+ New since version 0.2.0:
+ vibration effects no longer disappear when changing or restarting level
 XB-Maemo-Display-Name: Ghosts Overboard
 XB-Maemo-Icon-26: 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
 XSBC-Bugtracker: https://bugs.maemo.org/enter_bug.cgi?product=Ghosts%20Overboard