Changeset 2143 for code/branches

Timestamp:

Nov 5, 2008, 3:43:16 PM (16 years ago)

Author:

scheusso

Message:

added a function unregisterVariable to unregister variable that has been registered inside a synchronisable before
use it like this:
unregisterVariable(&this→myVar_) if you registered the variable with REGISTERDATA(this→myVar_)

Location:

code/branches/objecthierarchy/src/network

Files:

• Synchronisable.cc (modified) (2 diffs)
• Synchronisable.h (modified) (2 diffs)

code/branches/objecthierarchy/src/network/Synchronisable.cc

@@ -251 +251 @@
   * @param cb callback object that should get called, if the value of the variable changes
   */
-  void Synchronisable::registerVar(void *var, int size, variableType t, uint8_t mode, NetworkCallbackBase *cb){
+  void Synchronisable::registerVariable(void *var, int size, variableType t, uint8_t mode, NetworkCallbackBase *cb){
     assert( mode==direction::toclient || mode==direction::toserver || mode==direction::serverMaster || mode==direction::clientMaster);
     // create temporary synch.Var struct
@@ -285 +285 @@
 #endif
   }
+  
+  void Synchronisable::unregisterVariable(void *var){
+    std::list<synchronisableVariable *>::iterator it = syncList->begin();
+    while(it!=syncList->end()){
+      if( (*it)->var == var ){
+        delete *it;
+        syncList->erase(it);
+        return;
+      }
+      else
+        it++;
+    }
+    assert(0); //if we reach this point something went wrong
+  }
+  
 
   /**

code/branches/objecthierarchy/src/network/Synchronisable.h

@@ -42 +42 @@
 
 #define REGISTERDATA(varname, ...) \
-    registerVar((void*)&varname, sizeof(varname), DATA, __VA_ARGS__)
+    registerVariable((void*)&varname, sizeof(varname), DATA, __VA_ARGS__)
 #define REGISTERSTRING(stringname, ...) \
-    registerVar(&stringname, stringname.length()+1, STRING, __VA_ARGS__)
+    registerVariable(&stringname, stringname.length()+1, STRING, __VA_ARGS__)
 
 namespace orxonox
@@ -115 +115 @@
   protected:
     Synchronisable(BaseObject* creator);
-    void registerVar(void *var, int size, variableType t, uint8_t mode=0x1, NetworkCallbackBase *cb=0);
+    void registerVariable(void *var, int size, variableType t, uint8_t mode=0x1, NetworkCallbackBase *cb=0);
+    void unregisterVariable(void *var);
     void setObjectMode(uint8_t mode);
     void setObjectFrequency(unsigned int freq){ objectFrequency_ = freq; }