Changeset 7127 for code/branches/presentation3/src/modules/questsystem
- Timestamp:
- Jun 9, 2010, 9:32:58 PM (15 years ago)
- Location:
- code/branches/presentation3/src/modules/questsystem
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3/src/modules/questsystem/Quest.h
r7072 r7127 105 105 virtual bool fail(PlayerInfo* player); //!< Fails the Quest. 106 106 virtual bool complete(PlayerInfo* player); //!< Completes the Quest. 107 107 108 108 bool addListener(QuestListener* listener); //!< Adds a QuestListener to the list of QuestListeners listening to this Quest. 109 109 -
code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc
r6945 r7127 112 112 MultiTriggerContainer* mTrigger = orxonox_cast<MultiTriggerContainer*>(trigger); 113 113 Pawn* pawn = NULL; 114 114 115 115 //! If the trigger is neither a Playertrigger nor a MultiTrigger (i.e. a MultitriggerContainer) we can do anything with it. 116 116 if(pTrigger == NULL && mTrigger == NULL) 117 117 return false; 118 119 // If the trigger is a PlayerTrigger. 118 119 // If the trigger is a PlayerTrigger. 120 120 if(pTrigger != NULL) 121 121 { … … 125 125 pawn = pTrigger->getTriggeringPlayer(); 126 126 } 127 127 128 128 // If the trigger is a MultiTrigger (i.e. a MultiTriggerContainer) 129 129 if(mTrigger != NULL) -
code/branches/presentation3/src/modules/questsystem/QuestItem.cc
r6945 r7127 42 42 43 43 CreateUnloadableFactory(QuestItem); 44 44 45 45 /** 46 46 @brief … … 50 50 { 51 51 this->registered_ = false; 52 52 53 53 RegisterObject(QuestItem); 54 54 } -
code/branches/presentation3/src/modules/questsystem/QuestManager.cc
r7072 r7127 74 74 QuestManager::~QuestManager() 75 75 { 76 76 77 77 } 78 78 … … 250 250 return numQuests; 251 251 } 252 252 253 253 Quest* QuestManager::getParentQuest(PlayerInfo* player, int index) 254 254 { … … 272 272 return numQuests; 273 273 } 274 274 275 275 Quest* QuestManager::getSubQuest(Quest* quest, PlayerInfo* player, int index) 276 276 { … … 295 295 return numHints; 296 296 } 297 297 298 298 QuestHint* QuestManager::getHints(Quest* quest, PlayerInfo* player, int index) 299 299 { -
code/branches/presentation3/src/modules/questsystem/QuestNotification.cc
r6945 r7127 35 35 36 36 CreateUnloadableFactory(QuestNotification); 37 37 38 38 /** 39 39 @brief -
code/branches/presentation3/src/modules/questsystem/notifications/Notification.cc
r6945 r7127 41 41 42 42 CreateUnloadableFactory(Notification); 43 43 44 44 /** 45 45 @brief … … 69 69 Notification::~Notification() 70 70 { 71 71 72 72 } 73 73 -
code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc
r6945 r7127 66 66 NotificationManager::~NotificationManager() 67 67 { 68 68 69 69 } 70 70 … … 227 227 int identifier = this->listenerList_.find(listener)->second; 228 228 std::multimap<std::time_t, Notification*>* map = this->notificationLists_.find(identifier)->second; 229 229 230 230 // Make sure all Notifications are removed. 231 231 std::multimap<std::time_t, Notification*>::iterator it = map->begin(); -
code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc
r6945 r7127 57 57 { 58 58 this->registered_ = false; 59 59 60 60 RegisterObject(NotificationQueue); 61 61 this->initialize(); … … 431 431 // Unregister the NotificationQueue with the NotificationManager. 432 432 NotificationManager::getInstance().unregisterNotification(container->notification, this); 433 433 434 434 this->removeElement(container->overlay); 435 435 this->containers_.erase(container);
Note: See TracChangeset
for help on using the changeset viewer.