Changeset 1942

Timestamp:

Oct 18, 2008, 11:22:38 PM (16 years ago)

Author:

landauf

Message:

another small fix and a new levelfile (media update)

Location:

code/branches/objecthierarchy/src

Files:

• network/Server.cc (modified) (4 diffs)
• orxonox/gamestates/GSLevel.cc (modified) (1 diff)

code/branches/objecthierarchy/src/network/Server.cc

@@ -282 +282 @@
   bool Server::addClient(ENetEvent *event){
     unsigned int newid=0;
-    
+
     ClientInformation *temp = ClientInformation::insertBack(new ClientInformation);
     if(!temp){
@@ -295 +295 @@
     temp->setID(newid);
     temp->setPeer(event->peer);
-    
+
     // inform all the listeners
     orxonox::ObjectList<ClientConnectionListener>::iterator listener = orxonox::ObjectList<ClientConnectionListener>::begin();
@@ -302 +302 @@
       listener++;
     }
-    
+
     COUT(3) << "Server: added client id: " << temp->getID() << std::endl;
-    return createClient(temp->getID());  
+    return createClient(temp->getID());
 }
 
@@ -346 +346 @@
     while(listener){
       listener->clientDisconnected(client->getID());
+      listener++;
     }
 

code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.cc

@@ -159 +159 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        startLevel_ = new Level(Settings::getDataPath() + "levels/sample.oxw");
+        startLevel_ = new Level(Settings::getDataPath() + "levels/sample2.oxw");
         Loader::open(startLevel_);
     }