Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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/src/modules/questsystem
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/modules/questsystem/QuestGUI.cc

    • Property svn:eol-style set to native
    r5746 r5748  
    3030
    3131#include <sstream>
     32#include <CEGUIWindow.h>
     33#include <CEGUIWindowManager.h>
    3234
    3335#include "core/CoreIncludes.h"
    34 #include "core/GUIManager.h"
    35 #include "infos/PlayerInfo.h"
    3636#include "Quest.h"
    3737#include "QuestHint.h"
    38 #include "QuestDescription.h" //Debug
    3938#include "QuestItem.h"
    4039#include "QuestGUINode.h"
    4140#include "QuestManager.h"
    42 
    43 #include <CEGUIWindow.h>
    44 #include <CEGUIWindowManager.h>
    4541
    4642namespace orxonox {
  • code/trunk/src/modules/questsystem/QuestGUI.h

    • Property svn:eol-style set to native
    r5746 r5748  
    3636
    3737#include "questsystem/QuestsystemPrereqs.h"
     38
     39#include <list>
     40#include <map>
     41#include <string>
    3842#include <CEGUIForwardRefs.h>
    3943
    4044#include "core/OrxonoxClass.h"
    41 
    42 #include <map>
    43 #include <string>
    44 #include <list>
    4545
    4646namespace orxonox {
     
    9595           
    9696            PlayerInfo* player_; //!< The player that owns the GUI.
    97             CEGUI::WindowManager* windowManager_; //!< The CEGUI WindowManager. //TDO: needed?
     97            CEGUI::WindowManager* windowManager_; //!< The CEGUI WindowManager. //TODO: needed?
    9898            CEGUI::Window* rootWindow_; //!< The root CEGUI Window of the GUI.
    9999
  • code/trunk/src/modules/questsystem/QuestGUINode.cc

    • Property svn:eol-style set to native
    r5746 r5748  
    3131#include <sstream>
    3232
     33#include <CEGUIWindowManager.h>
     34#include <elements/CEGUIFrameWindow.h>
     35#include <elements/CEGUIPushButton.h>
     36#include <falagard/CEGUIFalWidgetLookFeel.h>
     37#include <falagard/CEGUIFalWidgetLookManager.h>
     38
    3339#include "core/CoreIncludes.h"
    34 #include "infos/PlayerInfo.h"
    3540#include "Quest.h"
    3641#include "QuestHint.h"
     
    3843#include "QuestDescription.h"
    3944#include "QuestGUI.h"
    40 
    41 #include <CEGUIWindow.h>
    42 #include <CEGUIWindowManager.h>
    43 #include <CEGUIFont.h>
    44 #include <CEGUI.h>
    4545
    4646namespace orxonox {
     
    117117    }
    118118
    119     int QuestGUINode::toggleVisibility(void)
     119    void QuestGUINode::toggleVisibility(void)
    120120    {
    121121       
     
    234234                        node->window_->setSize(CEGUI::UVector2(CEGUI::UDim(1.0, -13),CEGUI::UDim(0, 30)));
    235235                        node->window_->setPosition(CEGUI::UVector2(CEGUI::UDim(0, 0),CEGUI::UDim(0, offset)));
    236                         node->window_->setProperty("HorizontalAlignment", "Left"); // TDO: Get this working.
     236                        node->window_->setProperty("HorizontalAlignment", "Left"); // TODO: Get this working.
    237237                        window->addChildWindow(node->window_);
    238238                        offset += 30;
  • code/trunk/src/modules/questsystem/QuestGUINode.h

    • Property svn:eol-style set to native
    r5746 r5748  
    3131
    3232#include "questsystem/QuestsystemPrereqs.h"
    33 #include <CEGUIForwardRefs.h>
    34 
    35 #include "core/OrxonoxClass.h"
    3633
    3734#include <list>
    3835#include <string>
     36#include <CEGUIForwardRefs.h>
     37#include "core/OrxonoxClass.h"
    3938
    4039
     
    5049            virtual ~QuestGUINode(void);
    5150   
    52             int toggleVisibility(void);
     51            void toggleVisibility(void);
    5352
    5453            void getName(std::string & buffer); //!< Sets the input buffer to the name of the node.
  • code/trunk/src/modules/questsystem/QuestManager.cc

    r5745 r5748  
    3434#include "QuestManager.h"
    3535
     36#include <CEGUIWindow.h>
     37
    3638#include "util/Exception.h"
    3739#include "core/CoreIncludes.h"
    3840#include "core/GUIManager.h"
    3941#include "core/ConsoleCommand.h"
    40 #include "core/input/InputManager.h" //TDO: Necessary?
    41 #include <CEGUIWindow.h>
     42#include "infos/PlayerInfo.h"
    4243#include "overlays/GUIOverlay.h"
    4344
    44 #include "infos/PlayerInfo.h"
    4545#include "Quest.h"
    4646#include "QuestHint.h"
    47 #include "QuestItem.h" //TDO: Necessary?
     47#include "QuestItem.h"
    4848
    4949namespace orxonox
  • code/trunk/src/modules/questsystem/QuestManager.h

    r5745 r5748  
    6565
    6666            friend class ScopedSingleton<QuestManager, ScopeID::GSLevel>;
    67             friend class QuestGUI; //TDO: better solution.
     67            friend class QuestGUI; //TODO: better solution.
    6868            //friend std::map<std::string, Quest*> & QuestGUI::getQuests(void);
    6969
     
    9494            std::map<std::string, QuestHint*> hintMap_; //!< All QuestHints registered by their id's.
    9595
    96             //TDO: Call destructor of QuestGUI's on destruction of QuestManager?
     96            //TODO: Call destructor of QuestGUI's on destruction of QuestManager?
    9797            std::map<PlayerInfo*, QuestGUI*> questGUIs_; //!< All GUI's registered by the players.
    9898
  • code/trunk/src/modules/questsystem/QuestNotification.cc

    • Property svn:executable deleted
  • code/trunk/src/modules/questsystem/notifications/NotificationManager.cc

    r5738 r5748  
    8181            return false;
    8282
    83         std::time_t time = std::time(0); //TDO: Doesn't this expire? //!< Get current time.
     83        std::time_t time = std::time(0); //TODO: Doesn't this expire? //!< Get current time.
    8484
    8585        this->allNotificationsList_.insert(std::pair<std::time_t,Notification*>(time,notification));
     
    9696        {
    9797            std::set<std::string> set = it->first->getTargetsSet();
    98             if(all || set.find(notification->getSender()) != set.end() || set.find(ALL) != set.end()) //TDO: Make sure this works.
     98            if(all || set.find(notification->getSender()) != set.end() || set.find(ALL) != set.end()) //TODO: Make sure this works.
    9999            {
    100100                this->notificationLists_[it->second]->insert(std::pair<std::time_t,Notification*>(time,notification)); //!< Insert the Notification in the Notifications list of the current NotificationListener.
     
    123123        this->listenerList_[listener] = index; //!< Add the NotificationListener to the list of listeners.
    124124
    125         std::set<std::string> set = listener->getTargetsSet(); //TDO: Works this?
     125        std::set<std::string> set = listener->getTargetsSet(); //TODO: Works this?
    126126
    127127        //! 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

    r5738 r5748  
    140140                this->removeContainer(*it);
    141141                this->scroll(Vector2(0.0,-(1.1*this->getFontSize())));
    142                 it = this->containers_.begin(); //TDO: Needed?
     142                it = this->containers_.begin(); //TODO: Needed?
    143143            }
    144144
     
    443443        {
    444444            this->removeContainer(*it);
    445             it = this->containers_.begin(); //TDO: Needed?
     445            it = this->containers_.begin(); //TODO: Needed?
    446446        }
    447447    }
Note: See TracChangeset for help on using the changeset viewer.