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

Conflicts:
	pacman-c++/server.cpp

1 files changed, 2 insertions, 1 deletions

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);