Changeset 2022 for code/branches

Timestamp:

Oct 27, 2008, 8:55:56 PM (16 years ago)

Author:

dafrick

Message:

Compiles.

Location:

code/branches/questsystem/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• objects/QuestManager.cc (modified) (4 diffs)

code/branches/questsystem/src/orxonox/CMakeLists.txt

@@ -76 +76 @@
   objects/QuestHint.cc
   objects/QuestItem.cc
+  objects/QuestManager.cc
 
   tolua/tolua_bind.cc

code/branches/questsystem/src/orxonox/objects/QuestManager.cc

@@ -57 +57 @@
     bool QuestManager::registerQuest(Quest* quest)
     {
-        this->questMap_.insert ( pair<std::string,Quest>(quest->getId(),quest) );
+        questMap_.insert( std::pair<std::string,Quest*>(quest->getId(),quest) );
         return true;
     }
@@ -71 +71 @@
     bool QuestManager::registerHint(QuestHint* hint)
     {
-        this->hintMap_.insert ( pair<std::string,Hint>(hint->getId(),hint) );
+        hintMap_.insert ( std::pair<std::string,QuestHint*>(hint->getId(),hint) );
         return true;
     }
@@ -88 +88 @@
     {
         Quest* quest;
-        std::map<std::string, Quest*>::iterator it = this->questMap_.find(questId);
-        if (it != this->questMap_.end())
+        std::map<std::string, Quest*>::iterator it = questMap_.find(questId);
+        if (it != questMap_.end())
         {
-            quest = &(it->second);
+            quest = it->second;
         }
         else
@@ -113 +113 @@
         Throw exceptopns in case of errors.
     */
-    QuestHint* QuestManager::findHint(const std::string & hintId) const
+    QuestHint* QuestManager::findHint(const std::string & hintId)
     {
         QuestHint* hint;
-        std::map<std::string, QuestHint*>::iterator it = this->hintMap_.find(hintId);
-        if (it != this->hintMap_.end())
+        std::map<std::string, QuestHint*>::iterator it = hintMap_.find(hintId);
+        if (it != hintMap_.end())
         {
-            hint = &(it->second);
+            hint = it->second;
         }
         else