Changeset 2911 for code/trunk/src/orxonox/objects/quest/AddQuest.cc
- Timestamp:
- Apr 8, 2009, 2:58:40 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/questsystem5 (added) merged: 2777,2779,2781,2783,2785-2786,2788,2858
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/quest/AddQuest.cc
- Property svn:mergeinfo changed
/code/branches/questsystem5/src/orxonox/objects/quest/AddQuest.cc (added) merged: 2779,2785
r2910 r2911 28 28 29 29 /** 30 @file 30 @file AddQuest.cc 31 31 @brief Implementation of the AddQuest class. 32 32 */ … … 42 42 #include "orxonox/objects/infos/PlayerInfo.h" 43 43 #include "QuestManager.h" 44 #include "QuestDescription.h" 44 45 #include "Quest.h" 45 46 … … 72 73 { 73 74 SUPER(AddQuest, XMLPort, xmlelement, mode); 74 75 75 76 COUT(3) << "New AddQuest, with target Quest {" << this->getQuestId() << "}, created." << std::endl; 76 77 } … … 96 97 try 97 98 { 98 Quest* quest = QuestManager:: findQuest(this->getQuestId());99 Quest* quest = QuestManager::getInstance().findQuest(this->getQuestId()); 99 100 if(quest == NULL || !quest->start(player)) 100 101 { - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.