Changeset 2788 for code/branches
- Timestamp:
- Mar 15, 2009, 4:17:20 PM (16 years ago)
- Location:
- code/branches/questsystem5/src/orxonox
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/questsystem5/src/orxonox/gamestates/GSLevel.cc
r2786 r2788 180 180 delete this->playerManager_; 181 181 this->playerManager_ = 0; 182 } 183 184 if (this->questManager_) 185 { 186 delete this->questManager_; 187 this->questManager_ = NULL; 188 } 189 190 if (this->notificationManager_) 191 { 192 delete this->notificationManager_; 193 this->notificationManager_ = NULL; 182 194 } 183 195 -
code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.cc
r2786 r2788 52 52 Is inheriting from BaseObject proper? 53 53 */ 54 QuestManager::QuestManager() : BaseObject(this)54 QuestManager::QuestManager() 55 55 { 56 56 RegisterRootObject(QuestManager); -
code/branches/questsystem5/src/orxonox/objects/quest/QuestManager.h
r2786 r2788 40 40 #include <string> 41 41 42 #include "core/ BaseObject.h"42 #include "core/OrxonoxClass.h" 43 43 44 44 namespace orxonox … … 51 51 Damian 'Mozork' Frick 52 52 */ 53 class _OrxonoxExport QuestManager : public BaseObject53 class _OrxonoxExport QuestManager : public OrxonoxClass 54 54 { 55 55 public: -
code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.cc
r2786 r2788 54 54 Constructor. Registers the Object. 55 55 */ 56 NotificationManager::NotificationManager() : BaseObject(this)56 NotificationManager::NotificationManager() 57 57 { 58 58 RegisterRootObject(NotificationManager); -
code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationManager.h
r2786 r2788 37 37 #include "OrxonoxPrereqs.h" 38 38 39 #include "core/ BaseObject.h"39 #include "core/OrxonoxClass.h" 40 40 41 41 #include <map> … … 55 55 Damian 'Mozork' Frick 56 56 */ 57 class _OrxonoxExport NotificationManager : public BaseObject57 class _OrxonoxExport NotificationManager : public OrxonoxClass 58 58 { 59 59 public:
Note: See TracChangeset
for help on using the changeset viewer.