- we love ogg, we hate mp3/wav

- a lot of coding style/intent fix
- add constant.h to pro files

1 files changed, 52 insertions, 29 deletions

diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index cc85416..90d31b2 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -5,8 +5,8 @@
 #include "bonuspoint.h"
 #include "constants.h"
 
-MainWidget::MainWidget() {
-
+MainWidget::MainWidget()
+{
   QVBoxLayout *layout = new QVBoxLayout(this);
 
   QLabel *lbl = new QLabel("da kommt da spielstand hin", this);
@@ -29,14 +29,17 @@ MainWidget::MainWidget() {
 }
 
 // temporary
-transmission::map_t createDummyMap() {
+transmission::map_t createDummyMap()
+{
   transmission::map_t map;
   map = new transmission::field_t*[map_size[0]];
-  for (unsigned int i=0; i<map_size[0]; ++i) {
+  for (unsigned int i = 0; i < map_size[0]; ++i)
     map[i] = new transmission::field_t[map_size[1]];
-  }
-  for (unsigned int x=0; x<map_size[0]; ++x) {
-    for (unsigned int y=0; y<map_size[1]; ++y) {
+
+  for (unsigned int x = 0; x < map_size[0]; ++x)
+  {
+    for (unsigned int y = 0; y < map_size[1]; ++y)
+    {
       transmission::field_t &cur = map[x][y];
       cur = 0;
     }
@@ -60,52 +63,72 @@ transmission::map_t createDummyMap() {
   
   return map;
 }
+
 void MainWidget::loadDummyMap()
 {
   transmission::map_t map = createDummyMap();
 
-  for (unsigned int x=0; x<map_size[0]; ++x) {
-    for (unsigned int y=0; y<map_size[1]; ++y) {
+  for (unsigned int x = 0; x < map_size[0]; ++x)
+  {
+    for (unsigned int y = 0; y < map_size[1]; ++y)
+    {
       const transmission::field_t &cur = map[x][y];
-      if (cur == 0) {
+      if (cur == 0)
         continue;
-      }
-      qDebug() << "not 0 at " << x << "," << y << ":" << cur;
+      qDebug() << "not 0 at x=" << x << ", y=" << y << ", val=" << cur;
       
       Color color = static_cast<Color>(cur & transmission::color_mask);
-      qDebug() << "col " << color;
+      qDebug() << "col=" << color;
 
       PixmapItem *item = 0;
-      if (cur & transmission::block) {
+      if (cur & transmission::block)
         item = new Block(color);
-      } else if (cur & transmission::bonuspoint) {
+      else if (cur & transmission::bonuspoint)
         item = new BonusPoint();
-      } else if (cur & transmission::pacman) {
+      else if (cur & transmission::pacman)
+      {
         Actor *actor = 0;
         ActorMap::iterator it = m_actors.find(color);
-        if (it != m_actors.end()) {
+        if (it != m_actors.end())
           actor = it->second;
-        } else {
+        else
+        {
           qDebug() << "new actor of col" << color;
           actor = new Actor(color);
           m_actors[color] = actor;
           m_scene->addItem(actor);
-          actor->setPos( mapPositionToCoord(x, y) );
+          actor->setPos(mapPositionToCoord(x, y));
         }
+
         Actor::Movement direction;
-        switch (cur & transmission::direction_mask) {
-          case transmission::direction_left: direction = Actor::Left; break;
-          case transmission::direction_right: direction = Actor::Right; break;
-          case transmission::direction_up: direction = Actor::Up; break;
-          case transmission::direction_down: direction = Actor::Down; break;
-          default: Q_ASSERT(false);
+        switch (cur & transmission::direction_mask)
+        {
+        case 0:
+          break;
+        case transmission::direction_left:
+          direction = Actor::Left;
+          break;
+        case transmission::direction_right:
+          direction = Actor::Right;
+          break;
+        case transmission::direction_up:
+          direction = Actor::Up;
+          break;
+        case transmission::direction_down:
+          direction = Actor::Down;
+          break;
+        default:
+          Q_ASSERT(false);
         }
         //actor->move(direction, mapPositionToCoord(x, y);
-      } else { Q_ASSERT(false); }
-      
-      if(item != 0) {
+      }
+      else
+        Q_ASSERT(false);
+
+      if(item != 0)
+      {
         m_scene->addItem(item);
-        item->setPos( mapPositionToCoord(x, y) );
+        item->setPos(mapPositionToCoord(x, y));
       }
     }
   }