Changeset 8297

Timestamp:

Apr 22, 2011, 5:59:40 PM (14 years ago)

Author:

dafrick

Message:

Possible bug fix in PickupCarrier.

Location:

code/trunk/src

Files:

• modules/designtools/ScreenshotManager.cc (modified) (2 diffs)
• modules/designtools/SkyboxGenerator.cc (modified) (2 diffs)
• orxonox/interfaces/PickupCarrier.cc (modified) (1 diff)

code/trunk/src/modules/designtools/ScreenshotManager.cc

@@ -41 +41 @@
 #include <OgreRoot.h>
 #include <OgreViewport.h>
-// #include <X11/Xlib.h> TODO: Needed?
 
 #include "core/ConfigValueIncludes.h"
@@ -53 +52 @@
 #include "graphics/Camera.h"
 
+// #include <X11/Xlib.h> TODO: Needed?
+
 namespace orxonox
 {

code/trunk/src/modules/designtools/SkyboxGenerator.cc

@@ -37 +37 @@
 #include <OgreRenderWindow.h>
 #include <OgreCamera.h>
-// #include <X11/Xlib.h> TODO: Needed?
 
 #include "util/ScopedSingletonManager.h"
@@ -53 +52 @@
 
 #include "ScreenshotManager.h"
+
+// #include <X11/Xlib.h> TODO: Needed?
 
 namespace orxonox

code/trunk/src/orxonox/interfaces/PickupCarrier.cc

@@ -66 +66 @@
     {
         std::set<Pickupable*>::iterator it = this->pickups_.begin();
-        std::set<Pickupable*>::iterator temp;
+        Pickupable* temp;
+        // Iterate over all pickups that are attached to this PickupCarrier and destroy them.
         while(it != this->pickups_.end())
         {
+            temp = *it;
             (*it)->carrierDestroyed();
-            temp = it;
             it = this->pickups_.begin();
-            if(it == temp) // Infinite loop avoidance, in case the pickup wasn't removed from the carrier somewhere in the carrierDestroy() procedure.
+            if(temp == *it) // Infinite loop avoidance, in case the pickup wasn't removed from the carrier somewhere in the carrierDestroy() procedure.
             {
-                COUT(2) << "Oops. In a PickupCarrier, while cleaning up, a Pickupable (&" << (*temp) << ") didn't unregister itself as it should have." << std::endl;;
+                COUT(2) << "Oops. In a PickupCarrier, while cleaning up, a Pickupable (&" << temp << ") didn't unregister itself as it should have." << std::endl;;
                 it++;
             }