Changeset 7474 for code/trunk/src/modules/questsystem

Timestamp:

Sep 21, 2010, 11:15:44 PM (14 years ago)

Author:

dafrick

Message:

Synchronizing Notifications.
In the course of that, notifications are not longer sent by creating a Notification and the calling notification.send() bur by letting the NotificationManager handle all this: NotificationManager::getInstance().sendNotification(message)
This made QuestNotification obsolete, thus it was removde.

Also did some work on synchronizing the Script class. It should work properly most of the time, but the current solution is unreliable and unsatisfactory. So this will change as soon as I know how.

Location:

code/trunk/src/modules/questsystem

Files:

• CMakeLists.txt (modified) (1 diff)
• QuestDescription.cc (modified) (2 diffs)
• QuestDescription.h (modified) (1 diff)
• QuestNotification.cc (deleted)
• QuestNotification.h (deleted)
• QuestsystemPrereqs.h (modified) (1 diff)

code/trunk/src/modules/questsystem/CMakeLists.txt

@@ -10 +10 @@
   QuestListener.cc
   QuestManager.cc
-  QuestNotification.cc
 )
 

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

@@ -38 +38 @@
 #include "core/XMLPort.h"
 
-#include "QuestNotification.h"
+#include "infos/PlayerInfo.h"
+
+#include "notifications/NotificationManager.h"
 
 namespace orxonox
 {
     CreateFactory(QuestDescription);
+
+    /*static*/ const std::string QuestDescription::SENDER = "questsystem";
 
     /**
@@ -115 +119 @@
         }
 
-        QuestNotification* notification = new QuestNotification(this, message);
-        notification->send(player);
+        NotificationManager::sendNotification(message, player->getClientID(), QuestDescription::SENDER);
         return true;
     }

code/trunk/src/modules/questsystem/QuestDescription.h

@@ -128 +128 @@
 
         private:
+            static const std::string SENDER;
+
             std::string title_; //!< The title.
             std::string description_; //!< The description.

code/trunk/src/modules/questsystem/QuestsystemPrereqs.h

@@ -81 +81 @@
     class QuestListener;
     class QuestManager;
-    class QuestNotification;
 }