Changeset 5850 for code/branches/core5/src/modules/questsystem
- Timestamp:
- Oct 1, 2009, 11:44:53 AM (15 years ago)
- Location:
- code/branches/core5/src/modules/questsystem
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified code/branches/core5/src/modules/questsystem/QuestManager.h ¶
r5760 r5850 50 50 namespace orxonox 51 51 { 52 53 typedef ScopedSingleton<QuestManager, ScopeID::GSLevel> ScopedSingletonQuestManagerGSLevel; // workaround for tolua54 55 52 /** 56 53 @brief … … 60 57 Damian 'Mozork' Frick 61 58 */ 62 class _QuestsystemExport QuestManager : public ScopedSingletonQuestManagerGSLevel, public orxonox::OrxonoxClass 63 { 59 class _QuestsystemExport QuestManager 64 60 // tolua_end 61 : public ScopedSingleton<QuestManager, ScopeID::Root>, public orxonox::OrxonoxClass 62 { // tolua_export 65 63 66 friend class ScopedSingleton<QuestManager, ScopeID:: GSLevel>;64 friend class ScopedSingleton<QuestManager, ScopeID::Root>; 67 65 friend class QuestGUI; 68 66 … … 72 70 73 71 //! Returns a reference to the single instance of the Quest Manager. 74 static QuestManager& getInstance() { return ScopedSingleton<QuestManager, ScopeID:: GSLevel>::getInstance(); } // tolua_export72 static QuestManager& getInstance() { return ScopedSingleton<QuestManager, ScopeID::Root>::getInstance(); } // tolua_export 75 73 76 74 //! Retreive the main window for the GUI. -
TabularUnified code/branches/core5/src/modules/questsystem/notifications/NotificationManager.h ¶
r5738 r5850 46 46 namespace orxonox 47 47 { 48 49 48 /** 50 49 @brief … … 54 53 Damian 'Mozork' Frick 55 54 */ 56 class _QuestsystemExport NotificationManager : public ScopedSingleton<NotificationManager, ScopeID:: GSLevel>, public OrxonoxClass55 class _QuestsystemExport NotificationManager : public ScopedSingleton<NotificationManager, ScopeID::Root>, public OrxonoxClass 57 56 { 58 friend class ScopedSingleton<NotificationManager, ScopeID:: GSLevel>;57 friend class ScopedSingleton<NotificationManager, ScopeID::Root>; 59 58 public: 60 59 NotificationManager();
Note: See TracChangeset
for help on using the changeset viewer.