Changeset 8297 for code/trunk
- Timestamp:
- Apr 22, 2011, 5:59:40 PM (14 years ago)
- Location:
- code/trunk/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/modules/designtools/ScreenshotManager.cc
r8232 r8297 41 41 #include <OgreRoot.h> 42 42 #include <OgreViewport.h> 43 // #include <X11/Xlib.h> TODO: Needed?44 43 45 44 #include "core/ConfigValueIncludes.h" … … 53 52 #include "graphics/Camera.h" 54 53 54 // #include <X11/Xlib.h> TODO: Needed? 55 55 56 namespace orxonox 56 57 { -
code/trunk/src/modules/designtools/SkyboxGenerator.cc
r8234 r8297 37 37 #include <OgreRenderWindow.h> 38 38 #include <OgreCamera.h> 39 // #include <X11/Xlib.h> TODO: Needed?40 39 41 40 #include "util/ScopedSingletonManager.h" … … 53 52 54 53 #include "ScreenshotManager.h" 54 55 // #include <X11/Xlib.h> TODO: Needed? 55 56 56 57 namespace orxonox -
code/trunk/src/orxonox/interfaces/PickupCarrier.cc
r7547 r8297 66 66 { 67 67 std::set<Pickupable*>::iterator it = this->pickups_.begin(); 68 std::set<Pickupable*>::iterator temp; 68 Pickupable* temp; 69 // Iterate over all pickups that are attached to this PickupCarrier and destroy them. 69 70 while(it != this->pickups_.end()) 70 71 { 72 temp = *it; 71 73 (*it)->carrierDestroyed(); 72 temp = it;73 74 it = this->pickups_.begin(); 74 if( it == temp) // Infinite loop avoidance, in case the pickup wasn't removed from the carrier somewhere in the carrierDestroy() procedure.75 if(temp == *it) // Infinite loop avoidance, in case the pickup wasn't removed from the carrier somewhere in the carrierDestroy() procedure. 75 76 { 76 COUT(2) << "Oops. In a PickupCarrier, while cleaning up, a Pickupable (&" << (*temp)<< ") didn't unregister itself as it should have." << std::endl;;77 COUT(2) << "Oops. In a PickupCarrier, while cleaning up, a Pickupable (&" << temp << ") didn't unregister itself as it should have." << std::endl;; 77 78 it++; 78 79 }
Note: See TracChangeset
for help on using the changeset viewer.