From 817dcc4e4493fb89c6d52b5e5ce1548b6a047d08 Mon Sep 17 00:00:00 2001
From: manuel <manuel@mausz.at>
Date: Sun, 10 Apr 2011 21:34:29 +0200
Subject: - first round of coding cleanup - small sound fix

---
 pacman-c++/sceneholder.cpp | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

(limited to 'pacman-c++/sceneholder.cpp')

diff --git a/pacman-c++/sceneholder.cpp b/pacman-c++/sceneholder.cpp
index 515d5ec..0236470 100644
--- a/pacman-c++/sceneholder.cpp
+++ b/pacman-c++/sceneholder.cpp
@@ -14,9 +14,8 @@ SceneHolder::SceneHolder(QWidget* parent): QWidget(parent)
   m_scene->setBackgroundBrush(Qt::black);
 
   visualMap.resize(Constants::map_size.width);
-  for (int i=0; i<visualMap.size(); ++i) {
+  for (int i = 0; i < visualMap.size(); ++i)
     visualMap[i].resize(Constants::map_size.height);
-  }
 }
 
 void SceneHolder::updateMap(const Transmission::map_t& map)
@@ -34,16 +33,22 @@ void SceneHolder::updateMap(const Transmission::map_t& map)
       //qDebug() << "col=" << color;
 
       PixmapItem* item = NULL;
-      if (cur == Transmission::none) { // no update
-      } else if (cur & Transmission::empty) {
+      if (cur == Transmission::none)
+      {
+        // no update
+      }
+      else if (cur & Transmission::empty)
+      {
         PixmapItem* oldItem = visualMap[x][y];
         // remove elements (in case it's not an actor)
-        if (oldItem != NULL && dynamic_cast<Actor*>(item) == 0) {
+        if (oldItem != NULL && dynamic_cast<Actor*>(item) == NULL)
+        {
           m_scene->removeItem(oldItem);
           visualMap[x][y] = NULL;
           delete oldItem;
         }
-      } else if (cur & Transmission::block)
+      }
+      else if (cur & Transmission::block)
       {
         unsigned int neighbours = Block::None;
         // check left side
@@ -81,7 +86,8 @@ void SceneHolder::updateMap(const Transmission::map_t& map)
         actor->move(direction);
         qDebug() << "actor move " << direction;
       }
-      else {
+      else
+      {
         qDebug() << "abort at " << cur;
         Q_ASSERT(false);
       }
@@ -108,9 +114,18 @@ QPoint SceneHolder::mapPositionToCoord(unsigned int x, unsigned int y)
   return QPoint(x * Constants::field_size.width, y * Constants::field_size.height);
 }
 
+QPoint SceneHolder::mapPositionToCoord(QPoint point)
+{
+  return mapPositionToCoord(point.x(), point.y());
+}
+
 QPoint SceneHolder::CoordToMapPosition(unsigned int x, unsigned int y)
 {
   return QPoint(x / Constants::field_size.width, y / Constants::field_size.height);
 }
 
+QPoint SceneHolder::CoordToMapPosition(QPoint point)
+{
+  return CoordToMapPosition(point.x(), point.y());
+}
 
-- 
cgit v1.2.3