1 files changed, 17 insertions, 4 deletions

diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index 516d1f7..02055b7 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -4,6 +4,7 @@
 #include "block.h"
 #include "anyoption.h"
 #include "bonuspoint.h"
+#include "point.h"
 #include <QtNetwork/QTcpServer>
 #include <QtNetwork/QTcpSocket>
 #include <QTextStream>
@@ -342,12 +343,13 @@ void Server::sendUpdate(Transmission::map_t map)
 void Server::aiCalculate(Actor *actor)
 {
   /* move as long as possible in one direction */
-  if (m_actorMovements[actor->color()] != Actor::None)
-    return;
+  //if (m_actorMovements[actor->color()] != Actor::None)
+  //  return;
 
   QPoint actorpos = CoordToMapPosition(actor->pos().toPoint());
   QList<Actor::Movement> directions;
   directions << Actor::Left << Actor::Right << Actor::Up << Actor::Down;
+  QList<Actor::Movement> directions2(directions); // used if directions got empty
 
   QMutableListIterator<Actor::Movement> i(directions);
   while(i.hasNext())
@@ -366,12 +368,23 @@ void Server::aiCalculate(Actor *actor)
     if (block != NULL && block->color() != actor->color())
     {
       i.remove();
+      directions2.removeAll(direction);
+      continue;
+    }
+
+    /* if neighbour is not a point */
+    BonusPoint *bpoint = qgraphicsitem_cast<BonusPoint *>(item);
+    Point *point = qgraphicsitem_cast<Point *>(item);
+    if (bpoint == NULL && point == NULL)
+    {
+      i.remove();
       continue;
     }
   }
 
-  int rand = (int) (directions.size() * (qrand() / (RAND_MAX + 1.0)));
-  m_actorMovements[actor->color()] = directions.at(rand);
+  QList<Actor::Movement> *ptr = (!directions.empty()) ? &directions : &directions2;
+  int rand = (int) (ptr->size() * (qrand() / (RAND_MAX + 1.0)));
+  m_actorMovements[actor->color()] = ptr->at(rand);
 }
 
 void Server::keyPressUpdate()