Removed obsolete include

[ghostsoverboard] / seascene.cpp

diff --git a/seascene.cpp b/seascene.cpp
index 4c2e72c..b5d19af 100644 (file)
--- a/seascene.cpp
+++ b/seascene.cpp
@@ -1,5 +1,27 @@
+/**************************************************************************
+        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 "seascene.h"
-#include "timercontrolledtursas.h"
+#include "octopus.h"
 #include "ship.h"
 #include <QGraphicsPixmapItem>
 #include <QDebug>
@@ -49,8 +71,8 @@ void SeaScene::setupMap(int ghosts, int rocks, int octopuses)
     int numberOfXTiles  = width() / 40;
     int numberOfYTiles = height() /40;
 
-    qDebug() << numberOfXTiles << " slots in x direction";
-    qDebug() << numberOfYTiles << " slots in y rirection";
+//    qDebug() << numberOfXTiles << " slots in x direction";
+//    qDebug() << numberOfYTiles << " slots in y rirection";
 
     for (int i = 0; i < numberOfXTiles; i++ )
     {
@@ -67,8 +89,6 @@ void SeaScene::setupMap(int ghosts, int rocks, int octopuses)
     {
         QPointF * pPosition = findRandomFreeSlot();
 
-        qDebug() << "Found a place for a rock";
-
         //If there was no room no point to continue
         if (pPosition == NULL)
             break;
@@ -90,6 +110,7 @@ void SeaScene::setupMap(int ghosts, int rocks, int octopuses)
 
     //spread the octopuses
 
+    QList <Octopus*> octopusList;
 
     for (int i=0; i < octopuses; i++)
     {
@@ -100,7 +121,7 @@ void SeaScene::setupMap(int ghosts, int rocks, int octopuses)
             break;
 
     QPixmap octopusPixmap (":/pix/tursas.png");
-    TimerControlledTursas * pOctopus = new TimerControlledTursas (octopusPixmap,100);
+    Octopus * pOctopus = new Octopus(octopusPixmap,100);
     pOctopus->setData(0,"octopus");
     pOctopus->setPos(*pPosition);
     addItem(pOctopus);
@@ -108,6 +129,7 @@ void SeaScene::setupMap(int ghosts, int rocks, int octopuses)
     movingItems_.append(pOctopus);
     connect(this,SIGNAL(pauseOn()),pOctopus,SLOT(stopMoving()));
     connect(this,SIGNAL(pauseOff()),pOctopus,SLOT(startMoving()));
+    octopusList.append(pOctopus);
     delete pPosition;
 
     }
@@ -147,6 +169,10 @@ void SeaScene::setupMap(int ghosts, int rocks, int octopuses)
     movingItems_.append(pShip);
     connect(this,SIGNAL(pauseOn()),pShip,SLOT(stopMoving()));
     connect(this,SIGNAL(pauseOff()),pShip,SLOT(startMoving()));
+    foreach (Octopus* pOctopus, octopusList)
+    {
+        connect(pOctopus,SIGNAL(droppingGhosts()),pShip,SLOT(dropAllGhosts()));
+    }
     delete pPosition;
 }
 
@@ -235,7 +261,7 @@ QPointF* SeaScene::findRandomFreeSlot()
 
     int index = qrand()%freeTiles_.size();
 
-    qDebug()  << index << " index";
+//    qDebug()  << index << " index";
     return new QPointF (freeTiles_.takeAt(index));
 
 }
@@ -249,7 +275,7 @@ void SeaScene::removeGhost(QGraphicsItem *pGhost)
     if (ghostsLeft_ == 0)
     {
         emit allGhostsPicked();
-        qDebug() << "All ghosts picked!";
+ //       qDebug() << "All ghosts picked!";
     }
 }