Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2383


Ignore:
Timestamp:
Dec 10, 2008, 3:36:47 PM (16 years ago)
Author:
dafrick
Message:

Some verry small changes…

Location:
code/branches/questsystem3/src/orxonox
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • code/branches/questsystem3/src/orxonox/objects/quest/LocalQuest.h

    r2352 r2383  
    5555            <QuestDescription title="Title" description="Description." /> //The description of the quest.
    5656            <subquests>
    57         <Quest id ="questId1" /> //A list of n subquest, be aware, each of the <Quest /> tags must have a description and so on and so forth as well.
    58         ...
    59         <Quest id="questIdn" />
    60         </subquests>
    61         <hints>
    62         <QuestHint id="hintId1" /> //A list of n QuestHints, see QuestHint for the full XML representation of those.
    63         ...
    64         <QuestHint id="hintIdn" />
    65         </hints>
    66     <fail-effects>
    67         <QuestEffect /> //A list of QuestEffects, invoked when the Quest is failed, see QuestEffect for the full XML representation.
    68         ...
    69         <QuestEffect />
    70     </fail-effects>
    71     <complete-effects>
    72         <QuestEffect /> //A list of QuestEffects, invoked when the Quest is completed, see QuestEffect for the full XML representation.
    73         ...
    74         <QuestEffect />
    75     </complete-effects>
     57                <Quest id ="questId1" /> //A list of n subquest, be aware, each of the <Quest /> tags must have a description and so on and so forth as well.
     58                ...
     59                <Quest id="questIdn" />
     60                </subquests>
     61                <hints>
     62                <QuestHint id="hintId1" /> //A list of n QuestHints, see QuestHint for the full XML representation of those.
     63                ...
     64                <QuestHint id="hintIdn" />
     65                </hints>
     66            <fail-effects>
     67                <QuestEffect /> //A list of QuestEffects, invoked when the Quest is failed, see QuestEffect for the full XML representation.
     68                ...
     69                <QuestEffect />
     70            </fail-effects>
     71            <complete-effects>
     72                <QuestEffect /> //A list of QuestEffects, invoked when the Quest is completed, see QuestEffect for the full XML representation.
     73                ...
     74                <QuestEffect />
     75            </complete-effects>
    7676        </LocalQuest>
    7777    @author

  • code/branches/questsystem3/src/orxonox/objects/quest/QuestHint.h

    r2352 r2383  
    4646{
    4747
    48     //! The status of the hint.
     48    //! The state of the hint.
    4949    enum Enum
    5050    {
    … …  
    9595        private:
    9696            Quest* quest_; //!< The Quest the QuestHint belongs to.
    97             std::map<const PlayerInfo*, questHintStatus::Enum> playerStatus_; //!< List of the status for each player, with the Player-pointer as key.
     97            std::map<const PlayerInfo*, questHintStatus::Enum> playerStatus_; //!< List of the states for each player, with the Player-pointer as key.
    9898
    9999    };

  • code/branches/questsystem3/src/orxonox/objects/quest/QuestItem.cc

    r2352 r2383  
    9898    @return
    9999        Returns true if the string is likely to be of the required form.
    100     @todo
    101         Clarify form, more vigorous checks.
    102100    */
    103101    /*static*/ bool QuestItem::isId(const std::string & id)

  • code/branches/questsystem3/src/orxonox/objects/quest/QuestListener.cc

    r2353 r2383  
    3737#include "core/CoreIncludes.h"
    3838#include "core/XMLPort.h"
     39#include "util/Exception.h"
    3940
    4041#include "Quest.h"
    … …  
    115116        if(this->quest_ == NULL) //!< If there is no such Quest.
    116117        {
    117             COUT(1) << "This is bad! The QuestListener has not found a Quest qith a corresponding id." << std::endl; //TDO Throw a damn Exception!
     118            ThrowException(Argument, "This is bad! The QuestListener has not found a Quest with a corresponding id..");
    118119            return false;
    119120        }
    … …  
    197198    bool QuestListener::execute()
    198199    {
    199         this->fireEvent(true); //TDO This' right?
     200        this->fireEvent(true);
    200201        return true;
    201202    }

  • code/branches/questsystem3/src/orxonox/overlays/notifications/Notification.h

    r2280 r2383  
    4040    /**
    4141    @brief
    42        
     42        This is rather temporary, so don't start relying on it, some better version will come soon but the Interface will not likely be the same.
    4343    @author
    4444        Damian 'Mozork' Frick
Note: See TracChangeset for help on using the changeset viewer.