hackishly disabled audio for srv

made test movement work

4 files changed, 31 insertions, 7 deletions

diff --git a/pacman-c++/audioplayer.cpp b/pacman-c++/audioplayer.cpp
index 5507bb3..5170183 100644
--- a/pacman-c++/audioplayer.cpp
+++ b/pacman-c++/audioplayer.cpp
@@ -42,7 +42,9 @@ AudioPlayer::AudioPlayer()
   Phonon::createPath(m_player, m_output);
 
   preload();
+#ifndef SERVER
   test();
+#endif // SERVER
 }
 
 AudioPlayer *AudioPlayer::self()
@@ -74,6 +76,9 @@ bool AudioPlayer::isMuted() const
 
 void AudioPlayer::play(AudioPlayer::Sound sound)
 {
+#ifdef SERVER
+  return;
+#endif // SERVER
   if (!m_working)
     emit finished_p();
 
diff --git a/pacman-c++/pacman.server.pro b/pacman-c++/pacman.server.pro
index ae9dd2e..c7ca9aa 100644
--- a/pacman-c++/pacman.server.pro
+++ b/pacman-c++/pacman.server.pro
@@ -9,7 +9,8 @@ SOURCES += pixmapitem.cpp \
     point.cpp \
     audioplayer.cpp \
                 sceneholder.cpp \
-                util.cpp
+                util.cpp \
+                clicklabel.cpp
 HEADERS += pixmapitem.h \
     actor.h \
     animationmanager.h \
@@ -21,7 +22,9 @@ HEADERS += pixmapitem.h \
     point.h \
     audioplayer.h \
                 sceneholder.h \
-                util.h
+                util.h \
+                clicklabel.h
+HEADERS += pixmapitem.h \
 RESOURCES += pacman.qrc
 
 OBJECTS_DIR = .obj
diff --git a/pacman-c++/sceneholder.cpp b/pacman-c++/sceneholder.cpp
index ba9cc97..dbc3ca5 100644
--- a/pacman-c++/sceneholder.cpp
+++ b/pacman-c++/sceneholder.cpp
@@ -34,7 +34,16 @@ void SceneHolder::updateMap(const Transmission::map_t& map)
       //qDebug() << "col=" << color;
 
       PixmapItem* item = NULL;
-      if (cur & Transmission::block)
+      if (cur == 0) { // 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) {
+          m_scene->removeItem(oldItem);
+          visualMap[x][y] = NULL;
+          delete oldItem;
+        }
+      } else if (cur & Transmission::block)
       {
         unsigned int neighbours = Block::None;
         // check left side
@@ -71,8 +80,10 @@ void SceneHolder::updateMap(const Transmission::map_t& map)
           Util::transmissionMovementToActor(cur & Transmission::direction_mask);
         //actor->move(direction, mapPositionToCoord(x, y));
       }
-      else
+      else {
+        qDebug() << "abort at " << cur;
         Q_ASSERT(false);
+      }
 
       if (item != NULL)
       {
diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index 2c16453..be24da0 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -6,8 +6,12 @@ Server::Server(QWidget *parent)
   : SceneHolder(parent)
 {
   updateMap(Util::createDummyMap());
+
   Transmission::map_t map =  calculateUpdates();
-  updateMap(map);
+  for (int i=0; i<10; ++i) {
+    qDebug() << "doing srv update";
+    updateMap(map);
+  }
 }
 
 QMap< Color::Color, Actor::Movement > Server::getActorDirections()
@@ -17,7 +21,6 @@ QMap< Color::Color, Actor::Movement > Server::getActorDirections()
   return directions;
 }
 
-
 Transmission::map_t Server::calculateUpdates()
 {
   Transmission::map_t map = Util::createEmptyMap();
@@ -40,7 +43,9 @@ Transmission::map_t Server::calculateUpdates()
       case Actor::None: break;
       default: Q_ASSERT(false);
     }
-    map[newMapPosition.x()][newMapPosition.y()] = Transmission::pacman | i.key()  ;
+    map[newMapPosition.x()][newMapPosition.y()] =
+              Transmission::pacman | i.key() |
+              Util::actorMovementToTransmission(i.value()) ;
 
   }
   return map;