Changeset 5748

Timestamp:

Sep 19, 2009, 11:57:28 PM (15 years ago)

Author:

rgrieder

Message:

In quest system:

• Build fix (non-void function must return a value)
• Removed some header files to reduce compile time
• svn:eol-style "native" for the added files
• removed svn:executable property from QuestNotification.cc

Location:

code/trunk

Files:

• data/gui/layouts/QuestGUI.layout (modified) (1 prop)
• data/gui/scripts/QuestGUI.lua (modified) (1 prop)
• src/modules/questsystem/QuestGUI.cc (modified) (1 diff, 1 prop)
• src/modules/questsystem/QuestGUI.h (modified) (2 diffs, 1 prop)
• src/modules/questsystem/QuestGUINode.cc (modified) (4 diffs, 1 prop)
• src/modules/questsystem/QuestGUINode.h (modified) (2 diffs, 1 prop)
• src/modules/questsystem/QuestManager.cc (modified) (1 diff)
• src/modules/questsystem/QuestManager.h (modified) (2 diffs)
• src/modules/questsystem/QuestNotification.cc (modified) (1 prop)
• src/modules/questsystem/notifications/NotificationManager.cc (modified) (3 diffs)
• src/modules/questsystem/notifications/NotificationQueue.cc (modified) (2 diffs)

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

@@ -30 +30 @@
 
 #include <sstream>
+#include <CEGUIWindow.h>
+#include <CEGUIWindowManager.h>
 
 #include "core/CoreIncludes.h"
-#include "core/GUIManager.h"
-#include "infos/PlayerInfo.h"
 #include "Quest.h"
 #include "QuestHint.h"
-#include "QuestDescription.h" //Debug
 #include "QuestItem.h"
 #include "QuestGUINode.h"
 #include "QuestManager.h"
-
-#include <CEGUIWindow.h>
-#include <CEGUIWindowManager.h>
 
 namespace orxonox {

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

@@ -36 +36 @@
 
 #include "questsystem/QuestsystemPrereqs.h"
+
+#include <list>
+#include <map>
+#include <string>
 #include <CEGUIForwardRefs.h>
 
 #include "core/OrxonoxClass.h"
-
-#include <map>
-#include <string>
-#include <list>
 
 namespace orxonox {
@@ -95 +95 @@
             
             PlayerInfo* player_; //!< The player that owns the GUI.
-            CEGUI::WindowManager* windowManager_; //!< The CEGUI WindowManager. //TDO: needed?
+            CEGUI::WindowManager* windowManager_; //!< The CEGUI WindowManager. //TODO: needed?
             CEGUI::Window* rootWindow_; //!< The root CEGUI Window of the GUI.
 

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

@@ -31 +31 @@
 #include <sstream>
 
+#include <CEGUIWindowManager.h>
+#include <elements/CEGUIFrameWindow.h>
+#include <elements/CEGUIPushButton.h>
+#include <falagard/CEGUIFalWidgetLookFeel.h>
+#include <falagard/CEGUIFalWidgetLookManager.h>
+
 #include "core/CoreIncludes.h"
-#include "infos/PlayerInfo.h"
 #include "Quest.h"
 #include "QuestHint.h"
@@ -38 +43 @@
 #include "QuestDescription.h"
 #include "QuestGUI.h"
-
-#include <CEGUIWindow.h>
-#include <CEGUIWindowManager.h>
-#include <CEGUIFont.h>
-#include <CEGUI.h>
 
 namespace orxonox {
@@ -117 +117 @@
     }
 
-    int QuestGUINode::toggleVisibility(void)
+    void QuestGUINode::toggleVisibility(void)
     {
         
@@ -234 +234 @@
                         node->window_->setSize(CEGUI::UVector2(CEGUI::UDim(1.0, -13),CEGUI::UDim(0, 30)));
                         node->window_->setPosition(CEGUI::UVector2(CEGUI::UDim(0, 0),CEGUI::UDim(0, offset)));
-                        node->window_->setProperty("HorizontalAlignment", "Left"); // TDO: Get this working.
+                        node->window_->setProperty("HorizontalAlignment", "Left"); // TODO: Get this working.
                         window->addChildWindow(node->window_);
                         offset += 30;

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

@@ -31 +31 @@
 
 #include "questsystem/QuestsystemPrereqs.h"
-#include <CEGUIForwardRefs.h>
-
-#include "core/OrxonoxClass.h"
 
 #include <list>
 #include <string>
+#include <CEGUIForwardRefs.h>
+#include "core/OrxonoxClass.h"
 
 
@@ -50 +49 @@
             virtual ~QuestGUINode(void);
     
-            int toggleVisibility(void);
+            void toggleVisibility(void);
 
             void getName(std::string & buffer); //!< Sets the input buffer to the name of the node.

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

@@ -34 +34 @@
 #include "QuestManager.h"
 
+#include <CEGUIWindow.h>
+
 #include "util/Exception.h"
 #include "core/CoreIncludes.h"
 #include "core/GUIManager.h"
 #include "core/ConsoleCommand.h"
-#include "core/input/InputManager.h" //TDO: Necessary?
-#include <CEGUIWindow.h>
+#include "infos/PlayerInfo.h"
 #include "overlays/GUIOverlay.h"
 
-#include "infos/PlayerInfo.h"
 #include "Quest.h"
 #include "QuestHint.h"
-#include "QuestItem.h" //TDO: Necessary?
+#include "QuestItem.h"
 
 namespace orxonox

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

@@ -65 +65 @@
 
             friend class ScopedSingleton<QuestManager, ScopeID::GSLevel>;
-            friend class QuestGUI; //TDO: better solution.
+            friend class QuestGUI; //TODO: better solution.
             //friend std::map<std::string, Quest*> & QuestGUI::getQuests(void);
 
@@ -94 +94 @@
             std::map<std::string, QuestHint*> hintMap_; //!< All QuestHints registered by their id's.
 
-            //TDO: Call destructor of QuestGUI's on destruction of QuestManager?
+            //TODO: Call destructor of QuestGUI's on destruction of QuestManager?
             std::map<PlayerInfo*, QuestGUI*> questGUIs_; //!< All GUI's registered by the players.
 

code/trunk/src/modules/questsystem/notifications/NotificationManager.cc

@@ -81 +81 @@
             return false;
 
-        std::time_t time = std::time(0); //TDO: Doesn't this expire? //!< Get current time.
+        std::time_t time = std::time(0); //TODO: Doesn't this expire? //!< Get current time.
 
         this->allNotificationsList_.insert(std::pair<std::time_t,Notification*>(time,notification));
@@ -96 +96 @@
         {
             std::set<std::string> set = it->first->getTargetsSet();
-            if(all || set.find(notification->getSender()) != set.end() || set.find(ALL) != set.end()) //TDO: Make sure this works.
+            if(all || set.find(notification->getSender()) != set.end() || set.find(ALL) != set.end()) //TODO: Make sure this works.
             {
                 this->notificationLists_[it->second]->insert(std::pair<std::time_t,Notification*>(time,notification)); //!< Insert the Notification in the Notifications list of the current NotificationListener.
@@ -123 +123 @@
         this->listenerList_[listener] = index; //!< Add the NotificationListener to the list of listeners.
 
-        std::set<std::string> set = listener->getTargetsSet(); //TDO: Works this?
+        std::set<std::string> set = listener->getTargetsSet(); //TODO: Works this?
 
         //! If all senders are the target of the listener, then the list of notification for that specific listener is te same as the list of all Notifications.

code/trunk/src/modules/questsystem/notifications/NotificationQueue.cc

@@ -140 +140 @@
                 this->removeContainer(*it);
                 this->scroll(Vector2(0.0,-(1.1*this->getFontSize())));
-                it = this->containers_.begin(); //TDO: Needed?
+                it = this->containers_.begin(); //TODO: Needed?
             }
 
@@ -443 +443 @@
         {
             this->removeContainer(*it);
-            it = this->containers_.begin(); //TDO: Needed?
+            it = this->containers_.begin(); //TODO: Needed?
         }
     }