- Timestamp:
- Aug 9, 2011, 12:37:21 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/output/src/libraries/network/WANDiscovery.cc
r8817 r8832 32 32 #include <cstring> 33 33 34 #include "util/ScopedSingletonManager.h"35 34 #include "core/CoreIncludes.h" 36 35 … … 38 37 namespace orxonox 39 38 { 40 ManageScopedSingleton(WANDiscovery, ScopeID::Graphics, true);41 42 43 39 WANDiscovery::WANDiscovery() 44 40 { … … 80 76 81 77 /* callback for the network reply poller */ 82 int rhandler( char *addr, ENetEvent *ev )78 int WANDiscovery::rhandler( char *addr, ENetEvent *ev ) 83 79 { 84 80 /* error recognition */ … … 103 99 104 100 /* add to list */ 105 WANDiscovery::getInstance().servers_.push_back( toadd );101 this->servers_.push_back( toadd ); 106 102 } 107 103 else if( !strncmp( (char*)ev->packet->data, MSPROTO_SERVERLIST_END, … … 132 128 { 133 129 /* poll for reply and act according to what was received */ 134 switch( this->msc.pollForReply( rhandler, 500 ) )130 switch( this->msc.pollForReply( this, 500 ) ) 135 131 { case 0: /* no event occured, decrease timeout */ 136 132 --i; break;
Note: See TracChangeset
for help on using the changeset viewer.