Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1942


Ignore:
Timestamp:
Oct 18, 2008, 11:22:38 PM (11 years ago)
Author:
landauf
Message:

another small fix and a new levelfile (media update)

Location:
code/branches/objecthierarchy/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/objecthierarchy/src/network/Server.cc

    r1941 r1942  
    282282  bool Server::addClient(ENetEvent *event){
    283283    unsigned int newid=0;
    284    
     284
    285285    ClientInformation *temp = ClientInformation::insertBack(new ClientInformation);
    286286    if(!temp){
     
    295295    temp->setID(newid);
    296296    temp->setPeer(event->peer);
    297    
     297
    298298    // inform all the listeners
    299299    orxonox::ObjectList<ClientConnectionListener>::iterator listener = orxonox::ObjectList<ClientConnectionListener>::begin();
     
    302302      listener++;
    303303    }
    304    
     304
    305305    COUT(3) << "Server: added client id: " << temp->getID() << std::endl;
    306     return createClient(temp->getID()); 
     306    return createClient(temp->getID());
    307307}
    308308
     
    346346    while(listener){
    347347      listener->clientDisconnected(client->getID());
     348      listener++;
    348349    }
    349350
  • code/branches/objecthierarchy/src/orxonox/gamestates/GSLevel.cc

    r1916 r1942  
    159159        // call the loader
    160160        COUT(0) << "Loading level..." << std::endl;
    161         startLevel_ = new Level(Settings::getDataPath() + "levels/sample.oxw");
     161        startLevel_ = new Level(Settings::getDataPath() + "levels/sample2.oxw");
    162162        Loader::open(startLevel_);
    163163    }
Note: See TracChangeset for help on using the changeset viewer.