Changeset 7462 for code/trunk

Timestamp:

Sep 17, 2010, 8:49:06 PM (14 years ago)

Author:

dafrick

Message:

Small changes in Notification to work towards synchronizing them…

Location:

code/trunk/src/modules

Files:

• notifications/Notification.cc (modified) (3 diffs)
• questsystem/QuestListener.cc (modified) (1 diff)

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

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "network/NetworkFunction.h"
+#include "network/Host.h"
 #include "NotificationManager.h"
 
@@ -43 +44 @@
     CreateUnloadableFactory(Notification);
 
-    registerMemberNetworkFunction(Notification, sendHelper);
+    registerMemberNetworkFunction(Notification, send);
 
     /**
@@ -113 +114 @@
     bool Notification::send(unsigned int clientId, const std::string & sender = NotificationManager::NONE)
     {
-
-        if(GameMode::isStandalone())
+        if(GameMode::isStandalone() || Host::getPlayerID() == clientId)
         {
             this->sendHelper(sender);
         }
-        else
+        else if(GameMode::isServer())
         {
-            callMemberNetworkFunction(Notification, sendHelper, this->getObjectID(), clientId, sender);
+            callMemberNetworkFunction(Notification, send, this->getObjectID(), clientId, clientId, sender);
         }
 

code/trunk/src/modules/questsystem/QuestListener.cc

@@ -44 +44 @@
     CreateFactory(QuestListener);
 
-    //! Initialization of the static variables for the modes as strings.
+    // Initialization of the static variables for the modes as strings.
     /*static*/ const std::string QuestListener::ALL = "all";
     /*static*/ const std::string QuestListener::START = "start";