- Timestamp:
- Jul 12, 2009, 11:58:01 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core4 (added) merged: 3235-3237,3245-3250,3253-3254,3260-3261,3265,3270
- Property svn:mergeinfo changed
-
code/trunk/src/network/synchronisable/SynchronisableVariable.h
r3214 r3280 41 41 namespace orxonox{ 42 42 43 namespace variableDirection{44 enum syncdirection{45 toclient=0x1,46 toserver=0x243 namespace VariableDirection{ 44 enum Value{ 45 ToClient=0x1, 46 ToServer=0x2 47 47 }; 48 enum bidirectional{ 49 serverMaster=0x1, 50 clientMaster=0x2 48 } 49 namespace Bidirectionality{ 50 enum Value{ 51 ServerMaster=0x1, 52 ClientMaster=0x2 51 53 }; 52 54 } … … 69 71 { 70 72 public: 71 SynchronisableVariable(T& variable, uint8_t syncDirection= variableDirection::toclient, NetworkCallbackBase *cb=0);73 SynchronisableVariable(T& variable, uint8_t syncDirection=VariableDirection::ToClient, NetworkCallbackBase *cb=0); 72 74 virtual ~SynchronisableVariable(); 73 75 … … 88 90 { 89 91 public: 90 SynchronisableVariableBidirectional(T& variable, uint8_t master= variableDirection::serverMaster, NetworkCallbackBase *cb=0);92 SynchronisableVariableBidirectional(T& variable, uint8_t master=Bidirectionality::ServerMaster, NetworkCallbackBase *cb=0); 91 93 virtual ~SynchronisableVariableBidirectional(); 92 94
Note: See TracChangeset
for help on using the changeset viewer.