Merge branch 'master' of ssh://manuel.mausz.at/foop

Conflicts:
	pacman-c++/server.cpp

2 files changed, 3 insertions, 3 deletions

diff --git a/pacman-c++/sceneholder.cpp b/pacman-c++/sceneholder.cpp
index 3f92860..03abf7f 100644
--- a/pacman-c++/sceneholder.cpp
+++ b/pacman-c++/sceneholder.cpp
@@ -57,9 +57,8 @@ void SceneHolder::updateMap(const Transmission::map_t& map, const unsigned int x
   {
     GameEntity *oldItem = visualMap[x][y];
     /* special handling for purging field
-     * remove elements (in case it's not an actor)
      */
-    if (oldItem != NULL && qgraphicsitem_cast<Actor *>(oldItem) == NULL)
+    if (oldItem != NULL)
     {
       visualMap[x][y] = NULL;
       Actor *actor = NULL;
diff --git a/pacman-c++/server.cpp b/pacman-c++/server.cpp
index 39a6ee7..f2c0f1c 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -170,7 +170,7 @@ QPoint Server::addRandomPoint(Transmission::map_t map, Transmission::field_t typ
     }
   }
 
-  /* remove actors possitions from list
+  /* remove actors positions from list
    * performance would be better if actors would be listed in visualMap too
    * but this isn't possible that easily. see comment in updateMap(map)
    */
@@ -497,6 +497,7 @@ void Server::onRoundFinished()
 
 void Server::initRoundMap(bool firstPacket)
 {
+
   /* create new map */
   Transmission::map_t map =  Util::createDemoMap();
   Util::placeActors(map, m_maxplayers, Color::order);