Fixed a bug in vibration effects and upped version number

[ghostsoverboard] / orientationcontrolledgraphicspixmapobject.cpp

diff --git a/orientationcontrolledgraphicspixmapobject.cpp b/orientationcontrolledgraphicspixmapobject.cpp
index cff72a6..d86ea23 100644 (file)
--- a/orientationcontrolledgraphicspixmapobject.cpp
+++ b/orientationcontrolledgraphicspixmapobject.cpp
@@ -1,3 +1,26 @@
+/**************************************************************************
+        Ghosts Overboard - a game for Maemo 5
+
+        Copyright (C) 2011  Heli Hyvättinen
+
+        This file is part of Ghosts Overboard
+
+        Ghosts Overboard is free software: you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation, either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+**************************************************************************/
+
+
 #include "orientationcontrolledgraphicspixmapobject.h"
 #include <QDebug>
 #include <QGraphicsScene>
@@ -21,15 +44,15 @@ OrientationControlledGraphicsPixmapObject::OrientationControlledGraphicsPixmapOb
 void OrientationControlledGraphicsPixmapObject::startMoving()
 {
     rotationSensor_.start();
-    qDebug() << "started the sensor";
-    qDebug() << rotationSensor_.isActive();
+//    qDebug() << "started the sensor";
+//    qDebug() << rotationSensor_.isActive();
 }
 
 
 void OrientationControlledGraphicsPixmapObject::stopMoving()
 {
     rotationSensor_.stop();
-    qDebug () << "trying to stop the sensor";
+//    qDebug () << "trying to stop the sensor";
 }
 
 void OrientationControlledGraphicsPixmapObject::readRotationSensor()
@@ -61,31 +84,20 @@ void OrientationControlledGraphicsPixmapObject::readRotationSensor()
     setX(qBound(sceneRectangle.left(),newx,sceneRectangle.right()-pixmap().width()));
     setY(qBound(sceneRectangle.top(),newy,sceneRectangle.bottom()-pixmap().height()));
 
-    QList<QGraphicsItem*>  collidesList = collidingItems();
-    if (!collidesList.isEmpty())
+
+    //handle collisions and move back to the original position if false returned
+
+    if (handleCollisions() == false)
     {
-        qDebug() << collidesList.at(0)->data(0);
-        if (collidesList.at(0)->data(0) == "rock")
-        {
-            setX(oldx);
-            setY(oldy);
-        }
+        setX(oldx);
+        setY(oldy);
     }
 
 }
 
 
-void OrientationControlledGraphicsPixmapObject::setBoundaries(QRectF boundaryrect)
-{
-    boundaryrect_ = boundaryrect;
-
-}
-
-void OrientationControlledGraphicsPixmapObject::setObstacles(int key, QList<QVariant> values)
+bool OrientationControlledGraphicsPixmapObject::handleCollisions()
 {
-    obstacleKey_ = key;
-    obstacleValues_ = values;
+    return true;
 }
 
-
-