Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7769


Ignore:
Timestamp:
Dec 15, 2010, 7:12:32 PM (14 years ago)
Author:
smerkli
Message:

fixes 2

Location:
code/branches/presentation/src/libraries/network
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation/src/libraries/network/CMakeLists.txt

    r7768 r7769  
    8080    LANDiscovery.h
    8181    WANDiscovery.h
    82     MasterServerComm.h
    8382  PCH_FILE
    8483    NetworkPrecompiledHeaders.h

  • code/branches/presentation/src/libraries/network/MasterServerComm.cc

    r7768 r7769  
    2828
    2929#include "MasterServerComm.h"
    30 #include "util/ScopedSingletonManager.h"
    31 #include "core/CoreIncludes.h"
    3230
    3331namespace orxonox
    3432{
    35   ManageScopedSingleton(MasterServerComm, ScopeID::Root, true);
    3633
    3734  MasterServerComm::MasterServerComm()
    … …  
    4037     */
    4138    /* register object in orxonox */
    42     RegisterObject(MasterServerComm);
    4339  }
    4440

  • code/branches/presentation/src/libraries/network/MasterServerComm.h

    r7768 r7769  
    3535#include <cstring>
    3636#include <enet/enet.h>
    37 #include "util/Singleton.h"
    38 #include "core/OrxonoxClass.h"
    39 #include "core/CoreIncludes.h"
    40 #include "NetworkPrereqs.h"
    4137
    42 // tolua_begin
     38
    4339namespace orxonox
    4440{
    45   class _NetworkExport MasterServerComm
    46   // tolua_end
    47     : public Singleton<MasterServerComm>, public OrxonoxClass
    48   { // tolua_export
    49     friend class Singleton<MasterServerComm>;
     41  class MasterServerComm
     42  {
    5043    public:
    5144      /** constructor */
    … …  
    9790      int pollForReply( int (*callback)( char*, ENetEvent* ), int delayms );
    9891
    99       /** \return an instance of MasterServerComm
    100        *
    101        * Create and return an instance of  MasterServerComm.
    102        */
    103       static MasterServerComm& getInstance() { return Singleton<MasterServerComm>::getInstance(); } // tolua_export
    104 
    10592    private:
    10693      /** client handle */
    … …  
    115102      /** peer data holder */
    116103      ENetPeer *peer;
     104  };
    117105
    118       /** Singleton pointer */
    119       static MasterServerComm *singletonPtr_s;
    120   }; // tolua_export
    121 
    122 } // tolua_export
     106}
    123107
    124108#endif /* MASTERSERVERCOMM_H */
Note: See TracChangeset for help on using the changeset viewer.