Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2022


Ignore:
Timestamp:
Oct 27, 2008, 8:55:56 PM (15 years ago)
Author:
dafrick
Message:

Compiles. :D

Location:
code/branches/questsystem/src/orxonox
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/questsystem/src/orxonox/CMakeLists.txt

    r2021 r2022  
    7676  objects/QuestHint.cc
    7777  objects/QuestItem.cc
     78  objects/QuestManager.cc
    7879
    7980  tolua/tolua_bind.cc
  • code/branches/questsystem/src/orxonox/objects/QuestManager.cc

    r2021 r2022  
    5757    bool QuestManager::registerQuest(Quest* quest)
    5858    {
    59         this->questMap_.insert ( pair<std::string,Quest>(quest->getId(),quest) );
     59        questMap_.insert( std::pair<std::string,Quest*>(quest->getId(),quest) );
    6060        return true;
    6161    }
     
    7171    bool QuestManager::registerHint(QuestHint* hint)
    7272    {
    73         this->hintMap_.insert ( pair<std::string,Hint>(hint->getId(),hint) );
     73        hintMap_.insert ( std::pair<std::string,QuestHint*>(hint->getId(),hint) );
    7474        return true;
    7575    }
     
    8888    {
    8989        Quest* quest;
    90         std::map<std::string, Quest*>::iterator it = this->questMap_.find(questId);
    91         if (it != this->questMap_.end())
     90        std::map<std::string, Quest*>::iterator it = questMap_.find(questId);
     91        if (it != questMap_.end())
    9292        {
    93             quest = &(it->second);
     93            quest = it->second;
    9494        }
    9595        else
     
    113113        Throw exceptopns in case of errors.
    114114    */
    115     QuestHint* QuestManager::findHint(const std::string & hintId) const
     115    QuestHint* QuestManager::findHint(const std::string & hintId)
    116116    {
    117117        QuestHint* hint;
    118         std::map<std::string, QuestHint*>::iterator it = this->hintMap_.find(hintId);
    119         if (it != this->hintMap_.end())
     118        std::map<std::string, QuestHint*>::iterator it = hintMap_.find(hintId);
     119        if (it != hintMap_.end())
    120120        {
    121             hint = &(it->second);
     121            hint = it->second;
    122122        }
    123123        else
Note: See TracChangeset for help on using the changeset viewer.