Changeset 7326 for code/branches/notifications

Timestamp:

Sep 2, 2010, 12:08:16 PM (14 years ago)

Author:

dafrick

Message:

Some additional changes.

Location:

code/branches/notifications/src/modules/notifications

Files:

• CMakeLists.txt (modified) (1 diff)
• Notification.cc (modified) (2 diffs)
• Notification.h (modified) (1 diff)

code/branches/notifications/src/modules/notifications/CMakeLists.txt

@@ -16 +16 @@
     NotificationsPrecompiledHeaders.h
   LINK_LIBRARIES
-    objects
     orxonox
     overlays

code/branches/notifications/src/modules/notifications/Notification.cc

@@ -43 +43 @@
     CreateUnloadableFactory(Notification);
 
-    registerMemberNetworkFunction(Notification, send);
+    registerMemberNetworkFunction(Notification, sendHelper);
 
     /**
@@ -107 +107 @@
     bool Notification::send(unsigned int clientId, const std::string & sender = NotificationManager::NONE)
     {
-        if(GameMode::isMaster())
-        {
-            if(this->isSent()) //TODO: Needed?
-                return false;
 
-            this->sender_ = sender;
-            bool successful = NotificationManager::getInstance().registerNotification(this);
-            if(!successful)
-                return false;
-            this->sent_ = true;
+        callMemberNetworkFunction(Notification, sendHelper, this->getObjectID(), clientId, clientId, sender);
 
-            COUT(3) << "Notification \"" << this->getMessage() << "\" sent." << std::endl;
-        }
-        else
-        {
-            callMemberNetworkFunction(Notification, send, this->getObjectID(), clientId, clientId, sender);
-        }
+        return true;
+    }
+
+    bool Notification::sendHelper(unsigned int clientId, const std::string& sender)
+    {
+        if(this->isSent()) //TODO: Needed?
+            return false;
+
+        this->sender_ = sender;
+        bool successful = NotificationManager::getInstance().registerNotification(this);
+        if(!successful)
+            return false;
+        this->sent_ = true;
+
+        COUT(3) << "Notification \"" << this->getMessage() << "\" sent." << std::endl;
 
         return true;

code/branches/notifications/src/modules/notifications/Notification.h

@@ -58 +58 @@
 
             bool send(unsigned int clientId, const std::string & sender); //!< Sends the Notification to the Notificationmanager.
+            bool sendHelper(unsigned int clientId, const std::string& sender);
 
             /**