Changeset 2258 for code/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc

Timestamp:

Nov 25, 2008, 8:39:00 AM (17 years ago)

Author:

dafrick

Message:

Finalizing, found an error…

File:

• code/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc (modified) (1 diff)

code/branches/questsystem2/src/orxonox/objects/quest/GlobalQuest.cc

@@ -147 +147 @@
     bool GlobalQuest::isStartable(const PlayerInfo* player) const
     {
+        if(!(this->getParentQuest() == NULL || this->getParentQuest()->isActive(player)))
+        {
+            return false;
+        }
         return (this->isInactive(player) && !(this->status_ == questStatus::completed || this->status_ == questStatus::failed));
     }