Changeset 6927

Timestamp:

May 20, 2010, 10:28:10 AM (14 years ago)

Author:

scheusso

Message:

fix in levelmanager: if a template was assigned to the Level the gametype was set twice to the level which resulted in the level being twice in the list of active levels in the levelmanager and only once removed (when the level was destroyed)

File:

• code/branches/presentation3/src/orxonox/LevelManager.cc (modified) (2 diffs)

code/branches/presentation3/src/orxonox/LevelManager.cc

@@ -70 +70 @@
     void LevelManager::requestActivity(Level* level)
     {
-        COUT(0) << "pushing level into level list: " << level << endl;
+        if( std::find(this->levels_s.begin(), this->levels_s.end(), level)!=this->levels_s.end() )
+            return; // level is already in list
         this->levels_s.push_back(level);
         if (this->levels_s.size() == 1)
@@ -78 +79 @@
     void LevelManager::releaseActivity(Level* level)
     {
-        COUT(0) << "poping level from level list: " << level << endl;
         if (this->levels_s.size() > 0)
         {