Removed unnecessary code

2 files changed, 2 insertions, 33 deletions

diff --git a/pacman-c++/sceneholder.cpp b/pacman-c++/sceneholder.cpp
index 37db691..feef033 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 1c3caf9..e13682b 100644
--- a/pacman-c++/server.cpp
+++ b/pacman-c++/server.cpp
@@ -178,7 +178,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)
    */
@@ -508,41 +508,11 @@ void Server::onRoundFinished()
 void Server::initRoundMap(bool firstPacket)
 {
   disconnect(this, SIGNAL(allPointsRemoved()), this, SLOT(onRoundFinished()));
-  if (!firstPacket) {
-    // clear old map
-    for (unsigned int i=0; i<visualMap.size(); ++i) {
-      for (unsigned int j=0; j<visualMap[0].size(); ++j) {
-        GameEntity *e = visualMap[i][j];
-        if (e != NULL) {
-          if (qgraphicsitem_cast<Actor *>(e) == NULL) {
-            removeItem(e);
-            delete e;
-          }
-        }
-        visualMap[i][j] = 0;
-      }
-    }
-  }
 
   // create new map
   Transmission::map_t map =  Util::createDemoMap();
   // add content
   Util::placeActors(map, m_maxplayers, Color::order);
-  /*
-  if (!firstPacket) {
-    for (unsigned int i=0; i<Constants::map_size.width; ++i) {
-      for (unsigned int j=0; j<Constants::map_size.height; ++j) {
-        if (map[i][j] & Transmission::pacman) {
-          Color::Color color = static_cast<Color::Color>(map[i][j] & Transmission::color_mask);
-          Actor *actor = m_actors.value(color, NULL);
-          qDebug() << "setting actor to " << i << j << mapPositionToCoord(i, j);
-          actor->setPos(mapPositionToCoord(i, j));
-        }
-      }
-    }
-  }
-  */
-
   Util::fillPoints(map);
 
   /* save positions of blocks for later usage */