1 files changed, 10 insertions, 3 deletions

diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index ba2b3c9..b631345 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -74,8 +74,15 @@ Transmission::map_t Server::calculateUpdates()
       newMapPosition.setY(visualMap[newMapPosition.x()].size() - 1);
 
     // <t3h g4m3 10gic>
-    if(dynamic_cast<Block*>(visualMap[newMapPosition.x()][newMapPosition.y()]) != 0)
-      continue;
+    // TODO: support actors eating each other
+    PixmapItem *item = visualMap[newMapPosition.x()][newMapPosition.y()];
+    if (item != NULL) {
+      if (! item->checkEnter(actor)) { // movement invalid
+        newMapPosition = mapPosition;
+      } else { // apply actions of entering this field
+        item->enter(actor);
+      }
+    }
     // </t3h g4m2 10gic>
 
     if (mapPosition != newMapPosition)
@@ -114,7 +121,7 @@ void Server::waitForClientConnections()
 {
   QTcpServer *tcpSrv = new QTcpServer(this);
   // server must stay alive as long as sockets (qt parent mem mechanism)
-  tcpSrv->listen(QHostAddress::Any, Constants::port);
+  tcpSrv->listen(QHostAddress::Any, Constants::Networking::port);
 
 #define SINGLE