Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6945


Ignore:
Timestamp:
May 20, 2010, 10:36:48 PM (15 years ago)
Author:
dafrick
Message:

A lot of cleanup, mostly increasing output levels, which means, that the console is no longer cluttered by lots and lots of Quest-stuff (the log file still is, but that should be ok…).
Also some possible bugs (or let's say pitfalls) removed, which have been around for a long time and didn't cause any problems so far. Now they never will.
Also, regarding my previous commit. Quests seem tu work just fine, even the second time the level is loaded, which is awesome.

Ergo: Questsystem/Notificationsystem segfault upon loading a level with Quests/Notifications in it twice is now officially resolved.

Location:
code/branches/presentation3/src
Files:
27 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation3/src/modules/questsystem/AddQuest.cc

    r5781 r6945  
    6868        SUPER(AddQuest, XMLPort, xmlelement, mode);
    6969
    70         COUT(3) << "New AddQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
     70        COUT(4) << "New AddQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
    7171    }
    7272
    … …  
    8787        }
    8888
    89         COUT(3) << "AddQuest on player: " << player << " ." << std::endl;
     89        COUT(5) << "AddQuest on player: " << player << " ." << std::endl;
    9090
    9191        try
    … …  
    103103        }
    104104
    105         COUT(3) << "Quest {" << this->getQuestId() << "} successfully added to player: " << player << " ." << std::endl;
     105        COUT(4) << "Quest {" << this->getQuestId() << "} successfully added to player: " << player << " ." << std::endl;
    106106        return true;
    107107    }

  • code/branches/presentation3/src/modules/questsystem/AddQuestHint.cc

    r6940 r6945  
    7272        XMLPortParam(AddQuestHint, "hintId", setHintId, getHintId, xmlelement, mode);
    7373
    74         COUT(3) << "New AddQuestHint, with target QuestHint {" << this->getHintId() << "}, created." << std::endl;
     74        COUT(4) << "New AddQuestHint, with target QuestHint {" << this->getHintId() << "}, created." << std::endl;
    7575    }
    7676
    … …  
    111111        }
    112112
    113         COUT(3) << "AddQuestHint on player: " << player << " ." << std::endl;
     113        COUT(5) << "AddQuestHint on player: " << player << " ." << std::endl;
    114114
    115115        try
    … …  
    127127        }
    128128
    129         COUT(3) << "QuestHint {" << this->getHintId() << "} successfully added to player: " << player << " ." << std::endl;
     129        COUT(4) << "QuestHint {" << this->getHintId() << "} successfully added to player: " << player << " ." << std::endl;
    130130        return true;
    131131

  • code/branches/presentation3/src/modules/questsystem/AddReward.cc

    r6417 r6945  
    6868        XMLPortObject(AddReward, Rewardable, "", addRewardable, getRewardables, xmlelement, mode);
    6969
    70         COUT(3) << "New AddReward, with " << this->rewards_.size() << " Rewardables created." << std::endl;
     70        COUT(4) << "New AddReward, with " << this->rewards_.size() << " Rewardables created." << std::endl;
    7171    }
    7272
    … …  
    103103    bool AddReward::invoke(PlayerInfo* player)
    104104    {
    105         COUT(3) << "AddReward on player: " << player << " ." << std::endl;
     105        COUT(5) << "AddReward on player: " << player << " ." << std::endl;
    106106
    107107        bool check = true;
    … …  
    111111        }
    112112
    113         COUT(3) << "Rewardable successfully added to player." << player << " ." << std::endl;
     113        COUT(4) << "Rewardable successfully added to player." << player << " ." << std::endl;
    114114
    115115        return check;

  • code/branches/presentation3/src/modules/questsystem/CompleteQuest.cc

    r6417 r6945  
    6868        SUPER(CompleteQuest, XMLPort, xmlelement, mode);
    6969
    70         COUT(3) << "New CompleteQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
     70        COUT(4) << "New CompleteQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
    7171    }
    7272
    … …  
    8787        }
    8888
    89         COUT(3) << "CompleteQuest on player: " << player << " ." << std::endl;
     89        COUT(5) << "CompleteQuest on player: " << player << " ." << std::endl;
    9090
    9191        Quest* quest;
    … …  
    105105        }
    106106
    107         COUT(3) << "Quest {" << quest->getId() << "} successfully completed by player: " << player << " ." << std::endl;
     107        COUT(4) << "Quest {" << quest->getId() << "} successfully completed by player: " << player << " ." << std::endl;
    108108        return true;
    109109    }

  • code/branches/presentation3/src/modules/questsystem/FailQuest.cc

    r6417 r6945  
    6868        SUPER(FailQuest, XMLPort, xmlelement, mode);
    6969
    70         COUT(3) << "New FailQUest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
     70        COUT(4) << "New FailQUest, with target Quest {" << this->getQuestId() << "}, created." << std::endl;
    7171    }
    7272
    … …  
    8787        }
    8888
    89         COUT(3) << "FailQuest on player: " << player << " ." << std::endl;
     89        COUT(4) << "FailQuest on player: " << player << " ." << std::endl;
    9090
    9191        Quest* quest;
    … …  
    104104        }
    105105
    106         COUT(3) << "Quest {" << quest->getId() << "} failed by player: " << player << " ." << std::endl;
     106        COUT(4) << "Quest {" << quest->getId() << "} failed by player: " << player << " ." << std::endl;
    107107        return true;
    108108    }

  • code/branches/presentation3/src/modules/questsystem/GlobalQuest.cc

    r6417 r6945  
    7070        XMLPortObject(GlobalQuest, QuestEffect, "reward-effects", addRewardEffect, getRewardEffects, xmlelement, mode);
    7171
    72         COUT(3) << "New GlobalQuest {" << this->getId() << "} created." << std::endl;
     72        COUT(4) << "New GlobalQuest {" << this->getId() << "} created." << std::endl;
    7373    }
    7474
    … …  
    253253        this->rewards_.push_back(effect); //!< Add the QuestEffect to the list.
    254254
    255         COUT(3) << "Reward effect was added to Quest {" << this->getId() << "}." << std::endl;
     255        COUT(4) << "Reward effect was added to Quest {" << this->getId() << "}." << std::endl;
    256256        return true;
    257257    }

  • code/branches/presentation3/src/modules/questsystem/LocalQuest.cc

    r6417 r6945  
    6868        SUPER(LocalQuest, XMLPort, xmlelement, mode);
    6969
    70         COUT(3) << "New LocalQuest {" << this->getId() << "} created." << std::endl;
     70        COUT(4) << "New LocalQuest {" << this->getId() << "} created." << std::endl;
    7171    }
    7272

  • code/branches/presentation3/src/modules/questsystem/Quest.cc

    r6940 r6945  
    9999        this->parentQuest_ = quest;
    100100
    101         COUT(3) << "Parent Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
     101        COUT(4) << "Parent Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
    102102        return true;
    103103    }
    … …  
    122122        this->subQuests_.push_back(quest); //!< Adds the Quest to the end of the list of subquests.
    123123
    124         COUT(3) << "Sub Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
     124        COUT(4) << "Sub Quest {" << quest->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
    125125        return true;
    126126    }
    … …  
    146146        this->hints_.push_back(hint); //!< Adds the QuestHint to the end of the list of QuestHints.
    147147
    148         COUT(3) << "QuestHint {" << hint->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
     148        COUT(4) << "QuestHint {" << hint->getId() << "} was added to Quest {" << this->getId() << "}." << std::endl;
    149149        return true;
    150150    }
    … …  
    168168        this->failEffects_.push_back(effect); //!< Adds the QuestEffect to the end of the list of fail QuestEffects.
    169169
    170         COUT(3) << "A FailEffect was added to Quest {" << this->getId() << "}." << std::endl;
     170        COUT(4) << "A FailEffect was added to Quest {" << this->getId() << "}." << std::endl;
    171171        return true;
    172172    }
    … …  
    190190        this->completeEffects_.push_back(effect); //!< Adds the QuestEffect to the end of the list of complete QuestEffects.
    191191
    192         COUT(3) << "A CompleteEffect was added to Quest {" << this->getId() << "}." << std::endl;
     192        COUT(4) << "A CompleteEffect was added to Quest {" << this->getId() << "}." << std::endl;
    193193        return true;
    194194    }

  • code/branches/presentation3/src/modules/questsystem/QuestDescription.cc

    r6417 r6945  
    7474        XMLPortParam(QuestDescription, "completeMessage", setCompleteMessage, getCompleteMessage, xmlelement, mode);
    7575
    76         COUT(3) << "New QuestDescription with title '" << this->getTitle() << "' created." << std::endl;
     76        COUT(4) << "New QuestDescription with title '" << this->getTitle() << "' created." << std::endl;
    7777    }
    7878
    … …  
    8989        Make sure the messages meet the conditions.
    9090    */
    91     bool QuestDescription::notificationHelper(const std::string & item, const std::string & status) const
     91    bool QuestDescription::notificationHelper(const std::string & item, const std::string & status)
    9292    {
    9393        std::string message;
    … …  
    122122        }
    123123
    124         QuestNotification* notification = new QuestNotification(message);
     124        QuestNotification* notification = new QuestNotification(this, message);
    125125        notification->send();
    126126        return true;

  • code/branches/presentation3/src/modules/questsystem/QuestDescription.h

    r5781 r6945  
    8383            @return Returns a string containing the fail message of the QuestDescription.
    8484            */
    85             inline const std::string & getFailMessage(void) const
     85            inline const std::string & getFailMessage(void)
    8686                { return this->failMessage_; }
    8787
    … …  
    9090            @return Returns a string containing the complete message of the QuestDescription.
    9191            */
    92             inline const std::string & getCompleteMessage(void) const
     92            inline const std::string & getCompleteMessage(void)
    9393                { return this->completeMessage_; }
    9494
    … …  
    9797            @return Returns true if successful.
    9898            */
    99             inline bool sendAddHintNotification(void) const
     99            inline bool sendAddHintNotification(void)
    100100                { return notificationHelper("hint", ""); }
    101101
    … …  
    104104            @return Returns true if successful.
    105105            */
    106             inline bool sendAddQuestNotification(void) const
     106            inline bool sendAddQuestNotification(void)
    107107                { return notificationHelper("quest", "start"); }
    108108
    … …  
    111111            @return Returns true if successful.
    112112            */
    113             inline bool sendFailQuestNotification(void) const
     113            inline bool sendFailQuestNotification(void)
    114114                { return notificationHelper("quest", "fail"); }
    115115
    … …  
    118118            @return Returns true if successful.
    119119            */
    120             inline bool sendCompleteQuestNotification(void) const
     120            inline bool sendCompleteQuestNotification(void)
    121121                { return notificationHelper("quest", "complete"); }
    122122
    … …  
    127127            std::string completeMessage_; //!< The message displayed when the Quest is completed.
    128128
    129             bool notificationHelper(const std::string & item, const std::string & status) const; //!< Helper for sending QuestDescriptions as Notifications.
     129            bool notificationHelper(const std::string & item, const std::string & status); //!< Helper for sending QuestDescriptions as Notifications.
    130130
    131131            /**

  • code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc

    r6935 r6945  
    7878        XMLPortEventSink(QuestEffectBeacon, BaseObject, "execute", execute, xmlelement, mode); //TODO: Change BaseObject to MultiTrigger as soon as MultiTrigger is the base of all triggers.
    7979
    80         COUT(3) << "New QuestEffectBeacon created." << std::endl;
     80        COUT(4) << "New QuestEffectBeacon created." << std::endl;
    8181    }
    8282
    … …  
    134134        if(pawn == NULL)
    135135        {
    136             COUT(2) << "The QuestEffectBeacon was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
     136            COUT(4) << "The QuestEffectBeacon was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
    137137            return false;
    138138        }
    … …  
    147147        }
    148148
    149         COUT(3) << "QuestEffectBeacon executed on player: " << player << " ." << std::endl;
     149        COUT(4) << "QuestEffectBeacon executed on player: " << player << " ." << std::endl;
    150150
    151151        bool check = QuestEffect::invokeEffects(player, this->effects_); //!< Invoke the QuestEffects on the PlayerInfo.
    … …  
    249249        this->effects_.push_back(effect);
    250250
    251         COUT(3) << "A QuestEffect was added to a QuestEffectBeacon." << std::endl;
     251        COUT(4) << "A QuestEffect was added to a QuestEffectBeacon." << std::endl;
    252252        return true;
    253253    }

  • code/branches/presentation3/src/modules/questsystem/QuestGUI.cc

    r6746 r6945  
    101101    void QuestGUI::update(void)
    102102    {
    103         COUT(3) << "Updating QuestGUI..." << std::endl;
     103        COUT(4) << "Updating QuestGUI..." << std::endl;
    104104
    105105        this->clear(); //!< Clear the GUI.
    … …  
    122122            }
    123123        }
    124         COUT(3) << "Updating QuestGUI done." << std::endl;
     124        COUT(4) << "Updating QuestGUI done." << std::endl;
    125125    }
    126126
    … …  
    131131    void QuestGUI::clear(void)
    132132    {
    133         COUT(3) << "Clearing QuestGUI..." << std::endl;
     133        COUT(4) << "Clearing QuestGUI..." << std::endl;
    134134
    135135        //! Clear all nodes.

  • code/branches/presentation3/src/modules/questsystem/QuestGUINode.cc

    r6746 r6945  
    8181        this->createWindow();
    8282
    83         COUT(3) << "New QuestGUINode '" << this->window_->getName() << "' created." << std::endl;
     83        COUT(4) << "New QuestGUINode '" << this->window_->getName() << "' created." << std::endl;
    8484    }
    8585
    … …  
    269269            }
    270270
    271             COUT(3) << "Show Details: " << this->details_->getName() << std::endl;
     271            COUT(4) << "Show Details: " << this->details_->getName() << std::endl;
    272272        }
    273273
    … …  
    281281    bool QuestGUINode::openDetails(const CEGUI::EventArgs& e)
    282282    {
    283         COUT(3) << "Open QuestItem..." << std::endl;
     283        COUT(4) << "Open QuestItem..." << std::endl;
    284284
    285285        //CEGUI::Window* window = this->gui_->getRootWindow();

  • code/branches/presentation3/src/modules/questsystem/QuestHint.cc

    r6940 r6945  
    7373        QuestManager::getInstance().registerHint(this); //!< Registers the QuestHint with the QuestManager.
    7474
    75         COUT(3) << "New QuestHint {" << this->getId() << "} created." << std::endl;
     75        COUT(4) << "New QuestHint {" << this->getId() << "} created." << std::endl;
    7676    }
    7777
    … …  
    126126            else
    127127            {
    128                 COUT(2) << "An already active questHint was trying to get activated." << std::endl;
     128                COUT(4) << "An already active questHint was trying to get activated." << std::endl;
    129129                return false;
    130130            }
    131131        }
    132132
    133         COUT(2) << "A hint of a non-active quest was trying to get activated." << std::endl;
     133        COUT(4) << "A hint of a non-active quest was trying to get activated." << std::endl;
    134134        return false;
    135135    }

  • code/branches/presentation3/src/modules/questsystem/QuestItem.cc

    r6940 r6945  
    4040namespace orxonox
    4141{
     42
     43    CreateUnloadableFactory(QuestItem);
     44   
    4245    /**
    4346    @brief

  • code/branches/presentation3/src/modules/questsystem/QuestItem.h

    r6940 r6945  
    7272            @return Returns a pointer to the QuestDescription object of the QuestItem.
    7373            */
    74             inline const QuestDescription* getDescription(void) const
     74            inline QuestDescription* getDescription(void) const
    7575                { return this->description_; }
    7676

  • code/branches/presentation3/src/modules/questsystem/QuestListener.cc

    r6940 r6945  
    7777            this->quest_->addListener(this); //!< Adds the QuestListener to the Quests list of listeners.
    7878
    79         COUT(3) << "QuestListener created for quest: {" << this->quest_->getId() << "} with mode '" << this->getMode() << "'." << std::endl;
     79        COUT(4) << "QuestListener created for quest: {" << this->quest_->getId() << "} with mode '" << this->getMode() << "'." << std::endl;
    8080    }
    8181

  • code/branches/presentation3/src/modules/questsystem/QuestManager.cc

    r6940 r6945  
    115115        {
    116116            quest->setRegistered();
    117             COUT(3) << "Quest with questId {" << quest->getId() << "} successfully inserted." << std::endl;
     117            COUT(4) << "Quest with questId {" << quest->getId() << "} successfully inserted." << std::endl;
    118118            return true;
    119119        }
    … …  
    157157        {
    158158            hint->setRegistered();
    159             COUT(3) << "QuestHint with hintId {" << hint->getId() << "} successfully inserted." << std::endl;
     159            COUT(4) << "QuestHint with hintId {" << hint->getId() << "} successfully inserted." << std::endl;
    160160            return true;
    161161        }

  • code/branches/presentation3/src/modules/questsystem/QuestNotification.cc

    r6417 r6945  
    3232namespace orxonox {
    3333
    34     const std::string QuestNotification::SENDER("questsystem");
     34    /*static*/ const std::string QuestNotification::SENDER("questsystem");
    3535
     36    CreateUnloadableFactory(QuestNotification);
     37   
     38    /**
     39    @brief
     40        Default Constructor. Creates a useless QuestNotification.
     41    */
    3642    QuestNotification::QuestNotification(BaseObject* creator) : Notification(creator)
    3743    {
    38         this->initialize();
     44        RegisterObject(QuestNotification);
    3945    }
    4046
    41     QuestNotification::QuestNotification(const std::string & message) : Notification(message)
     47    /**
     48    @brief
     49        Creates a QuestNotification with the input message.
     50    @param message
     51        The message to be sent.
     52    */
     53    QuestNotification::QuestNotification(BaseObject* creator, const std::string & message) : Notification(creator, message)
    4254    {
    43         this->initialize();
     55        RegisterObject(QuestNotification);
    4456    }
    4557
     58    /**
     59    @brief
     60        Destructor.
     61    */
    4662    QuestNotification::~QuestNotification()
    4763    {
    … …  
    4965    }
    5066
     67    /**
     68    @brief
     69        Send the QuestNotification.
     70    @return
     71        Returns true if successful.
     72    */
    5173    bool QuestNotification::send(void)
    5274    {
    … …  
    5476    }
    5577
    56     void QuestNotification::initialize(void)
    57     {
    58         RegisterObject(QuestNotification);
    59     }
    60 
    6178
    6279}

  • code/branches/presentation3/src/modules/questsystem/QuestNotification.h

    r5781 r6945  
    3939    /**
    4040    @brief
    41 
     41        The QuestNotification is a special Notification that has the single property that it is only sent by the questsystem.
    4242    @author
    4343        Damian 'Mozork' Frick
    … …  
    4646    {
    4747        public:
    48             QuestNotification(BaseObject* creator);
    49             QuestNotification(const std::string & message);
    50             virtual ~QuestNotification();
     48            QuestNotification(BaseObject* creator); //!< Default Constructor.
     49            QuestNotification(BaseObject* creator, const std::string & message); //!< Constructor.
     50            virtual ~QuestNotification(); //!< Destructor.
    5151
    52             bool send(void);
     52            bool send(void); //!< Send the QuestNotification.
    5353
    5454        private:
    55             static const std::string SENDER;
    56 
    57             void initialize(void);
     55            static const std::string SENDER; //!< A string identifying the questsystem as the sender.
    5856
    5957    };

  • code/branches/presentation3/src/modules/questsystem/notifications/Notification.cc

    r6417 r6945  
    4040{
    4141
     42    CreateUnloadableFactory(Notification);
     43   
    4244    /**
    4345    @brief
    … …  
    5658        The message of the Notification.
    5759    */
    58     Notification::Notification(const std::string & message) : BaseObject(NULL)
     60    Notification::Notification(BaseObject* creator, const std::string & message) : BaseObject(creator)
    5961    {
    6062        this->message_ = message;
    … …  
    6769    Notification::~Notification()
    6870    {
     71       
    6972    }
    7073

  • code/branches/presentation3/src/modules/questsystem/notifications/Notification.h

    r5781 r6945  
    5353        public:
    5454            Notification(BaseObject* creator);
    55             Notification(const std::string & message);
     55            Notification(BaseObject* creator, const std::string & message);
    5656            virtual ~Notification();
    5757

  • code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc

    r6944 r6945  
    118118    @brief
    119119        Unregisters a Notification within the NotificationManager.
     120    @param notification
     121        A pointer to the Notification to be unregistered.
     122    @param listener
     123        A pointer to the NotificationListener the Notification is unregistered for.
    120124    */
    121125    void NotificationManager::unregisterNotification(Notification* notification, NotificationListener* listener)
    … …  
    124128        assert(listener);
    125129
     130        // If the Notification was removed from the list of Notifications of the input NotificationListener, the counter for the Notification of the number of NotificationListeners it is present in is decremented.
    126131        if(this->removeNotification(notification, *(this->notificationLists_.find(this->listenerList_.find(listener)->second)->second)))
    127132            this->listenerCounter_[notification] = this->listenerCounter_[notification] - 1;
     133
     134        // If the Notification is no longer present in any of the NotificationListeners it can be removed from the map of all Notifications and be destroyed.
    128135        if(this->listenerCounter_[notification] == (unsigned int) 0)
    129136        {
    130137            this->removeNotification(notification, this->allNotificationsList_);
     138            this->listenerCounter_.erase(notification);
    131139            notification->destroy();
    132140        }
    … …  
    138146    @brief
    139147        Helper method that removes an input notification form an input map.
     148    @param notification
     149        A pointer to the notification to be removed.
     150    @param map
     151        The map the notification should be removed from.
     152    @return
     153        Returns true if successful.
    140154    */
    141155    bool NotificationManager::removeNotification(Notification* notification, std::multimap<std::time_t, Notification*>& map)
    142156    {
     157        // Iterates through all items in the map until the Notification is found.
     158        //TODO: Do more efficiently?
    143159        for(std::multimap<std::time_t, Notification*>::iterator it = map.begin(); it != map.end(); it++)
    144160        {
    … …  
    222238        this->listenerList_.erase(listener);
    223239        this->notificationLists_.erase(identifier);
    224         delete map;
     240
     241        // If the map is not the map of all notifications, delete it.
     242        if(map != &this->allNotificationsList_)
     243            delete map;
    225244
    226245        COUT(4) << "NotificationListener unregistered with the NotificationManager." << std::endl;

  • code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.h

    r6944 r6945  
    6060            virtual ~NotificationManager();
    6161
    62             static const std::string ALL;
    63             static const std::string NONE;
     62            static const std::string ALL; //!< Static string to indicate a sender that sends to all NotificationListeners.
     63            static const std::string NONE; //!< Static string to indicare a sender that sends to no specific NotificationListener.
    6464
    6565            bool registerNotification(Notification* notification); //!< Registers a Notification within the NotificationManager.
    … …  
    9999            std::map<Notification*, unsigned int> listenerCounter_; //!< A container to store the number of NotificationListeners a Notification is registered with.
    100100
    101             bool removeNotification(Notification* notification, std::multimap<std::time_t, Notification*>& map);
    102 
     101            bool removeNotification(Notification* notification, std::multimap<std::time_t, Notification*>& map); //!< Helper method that removes an input notification form an input map.
    103102
    104103    };

  • code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc

    r6944 r6945  
    124124        XMLPortParam(NotificationQueue, "position", setPosition, getPosition, xmlElement, mode);
    125125
    126         COUT(3) << "NotificationQueue created." << std::endl;
     126        COUT(3) << "NotificationQueue '" << this->getName() << "' created." << std::endl;
    127127    }
    128128
    … …  
    179179        delete notifications;
    180180
    181         COUT(3) << "NotificationQueue updated." << std::endl;
     181        COUT(4) << "NotificationQueue '" << this->getName() << "' updated." << std::endl;
    182182    }
    183183
    … …  
    202202        }
    203203
    204         COUT(3) << "NotificationQueue updated. A new Notifications has been added." << std::endl;
     204        COUT(4) << "NotificationQueue '" << this->getName() << "' updated. A new Notifications has been added." << std::endl;
    205205    }
    206206
    … …  
    429429            return false;
    430430
     431        // Unregister the NotificationQueue with the NotificationManager.
    431432        NotificationManager::getInstance().unregisterNotification(container->notification, this);
    432433       

  • code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.h

    r6944 r6945  
    7171
    7272        Creating a NotificationQueue through XML goes as follows:
     73        Be aware that the NotificationQueue must be inside the <Level></Level> tags or bad things will happen.
    7374        <NotificationQueue
    7475            name = "SuperQueue" //Name of your OverlayQueue.

  • code/branches/presentation3/src/orxonox/interfaces/NotificationListener.h

    r5929 r6945  
    4747    class Notification;
    4848
     49    /**
     50    @brief
     51        NotificationListener interface.
     52    @author
     53        Fabian 'x3n' Landau
     54    */
    4955    class _OrxonoxExport NotificationListener : virtual public OrxonoxClass
    5056    {
Note: See TracChangeset for help on using the changeset viewer.