Changeset 2069 for code/branches/objecthierarchy/src/core/Event.cc

Timestamp:

Oct 30, 2008, 11:58:31 PM (16 years ago)

Author:

landauf

Message:

fixed a bug in the event system
fixed a bug in Trigger and tweaked some features

File:

• code/branches/objecthierarchy/src/core/Event.cc (modified) (2 diffs)

code/branches/objecthierarchy/src/core/Event.cc

@@ -38 +38 @@
     }
 
-    void EventContainer::process(BaseObject* object, const Event& event)
+    void EventContainer::process(void* object, const Event& event)
     {
         if (this->eventname_ == event.sectionname_)
@@ -47 +47 @@
                     ++this->activeEvents_;
                 else
+                {
                     --this->activeEvents_;
 
+                    if (this->activeEvents_ < 0)
+                        this->activeEvents_ = 0;
+                }
+
                 if (this->eventfunction_->getParamCount() == 0 && event.activate_)
-                    (*this->eventfunction_)(object);
+                    (*this->eventfunction_)();
                 else if ((this->activeEvents_ == 1 && event.activate_) || (this->activeEvents_ == 0 && !event.activate_))
                 {
                     if (this->eventfunction_->getParamCount() == 1)
-                        (*this->eventfunction_)(object, this->activeEvents_);
+                        (*this->eventfunction_)(this->activeEvents_);
                     else if (this->eventfunction_->getParamCount() >= 2 && event.castedOriginator_)
-                        (*this->eventfunction_)(object, this->activeEvents_, event.castedOriginator_);
+                        (*this->eventfunction_)(this->activeEvents_, event.castedOriginator_);
                 }
             }