Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 15, 2010, 6:53:02 PM (13 years ago)
Author:
smerkli
Message:

fixes

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r7765 r7768  
    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"
    3741
    3842// tolua_begin
    … …  
    4044{
    4145  class _NetworkExport MasterServerComm
     46  // tolua_end
    4247    : public Singleton<MasterServerComm>, public OrxonoxClass
    4348  { // tolua_export
    … …  
    9297      int pollForReply( int (*callback)( char*, ENetEvent* ), int delayms );
    9398
    94       /** \return an instance of WANDiscovery
     99      /** \return an instance of MasterServerComm
    95100       *
    96        * Create and return an instance of WANDiscovery.
     101       * Create and return an instance of  MasterServerComm.
    97102       */
    98103      static MasterServerComm& getInstance() { return Singleton<MasterServerComm>::getInstance(); } // tolua_export
    … …  
    112117
    113118      /** Singleton pointer */
    114       static MasterServerComm* singletonPtr_s;
     119      static MasterServerComm *singletonPtr_s;
    115120  }; // tolua_export
    116121
Note: See TracChangeset for help on using the changeset viewer.