Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9656 in orxonox.OLD for trunk/src/lib/network/synchronizeable_var


Ignore:
Timestamp:
Aug 4, 2006, 11:01:28 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy bache back with no conflicts

Location:
trunk/src/lib/network/synchronizeable_var
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/network/synchronizeable_var/synchronizeable_bool.h

    r9406 r9656  
    1212
    1313  public:
    14     SynchronizeableBool( bool * ptrIn, bool * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     14    SynchronizeableBool( bool * ptrIn, bool * ptrOut, std::string name, int permission, int priority = 0 );
    1515    virtual ~SynchronizeableBool();
    1616

  • trunk/src/lib/network/synchronizeable_var/synchronizeable_float.h

    r9406 r9656  
    1313
    1414  public:
    15     SynchronizeableFloat( float * ptrIn, float * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     15    SynchronizeableFloat( float * ptrIn, float * ptrOut, std::string name, int permission, int priority = 0 );
    1616    virtual ~SynchronizeableFloat();
    1717

  • trunk/src/lib/network/synchronizeable_var/synchronizeable_int.h

    r9406 r9656  
    1313
    1414  public:
    15     SynchronizeableInt( int * ptrIn, int * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     15    SynchronizeableInt( int * ptrIn, int * ptrOut, std::string name, int permission, int priority = 0 );
    1616    virtual ~SynchronizeableInt();
    1717

  • trunk/src/lib/network/synchronizeable_var/synchronizeable_ip.h

    r9406 r9656  
    1515
    1616  public:
    17     SynchronizeableIP( IP *ptrIn, IP * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     17    SynchronizeableIP( IP *ptrIn, IP * ptrOut, std::string name, int permission, int priority = 0 );
    1818    virtual ~SynchronizeableIP();
    1919

  • trunk/src/lib/network/synchronizeable_var/synchronizeable_quaternion.h

    r9406 r9656  
    1414
    1515  public:
    16     SynchronizeableQuaternion( Quaternion * ptrIn, Quaternion * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     16    SynchronizeableQuaternion( Quaternion * ptrIn, Quaternion * ptrOut, std::string name, int permission, int priority = 0 );
    1717    virtual ~SynchronizeableQuaternion();
    1818

  • trunk/src/lib/network/synchronizeable_var/synchronizeable_string.h

    r9406 r9656  
    1414
    1515  public:
    16     SynchronizeableString( std::string * ptrIn, std::string * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     16    SynchronizeableString( std::string * ptrIn, std::string * ptrOut, std::string name, int permission, int priority = 0 );
    1717    virtual ~SynchronizeableString();
    1818

  • trunk/src/lib/network/synchronizeable_var/synchronizeable_uint.h

    r9406 r9656  
    1313
    1414  public:
    15     SynchronizeableUInt( unsigned int * ptrIn, unsigned int * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     15    SynchronizeableUInt( unsigned int * ptrIn, unsigned int * ptrOut, std::string name, int permission, int priority = 0 );
    1616    virtual ~SynchronizeableUInt();
    1717

  • trunk/src/lib/network/synchronizeable_var/synchronizeable_var.h

    r9494 r9656  
    1515
    1616  public:
    17     SynchronizeableVar( void * ptrIn, void * ptrOut, std::string name, int length, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     17    SynchronizeableVar( void * ptrIn, void * ptrOut, std::string name, int length, int permission, int priority = 0 );
    1818    virtual ~SynchronizeableVar();
    1919

  • trunk/src/lib/network/synchronizeable_var/synchronizeable_vector.h

    r9406 r9656  
    1414
    1515  public:
    16     SynchronizeableVector( Vector * ptrIn, Vector * ptrOut, std::string name, int permission = PERMISSION_MASTER_SERVER, int priority = 0 );
     16    SynchronizeableVector( Vector * ptrIn, Vector * ptrOut, std::string name, int permission, int priority = 0 );
    1717    virtual ~SynchronizeableVector();
    1818
Note: See TracChangeset for help on using the changeset viewer.