Changeset 11510 for code/branches

Timestamp:

Oct 23, 2017, 4:41:56 PM (7 years ago)

Author:

patricwi

Message:

looking for SEGFault

Location:

code/branches/HUD_HS16/src

Files:

• modules/overlays/hud/HUDPickupItem.cc (modified) (2 diffs)
• modules/overlays/hud/HUDPickupSystem.cc (modified) (2 diffs)
• modules/pickup/PickupManager.cc (modified) (2 diffs)
• orxonox/interfaces/Pickupable.cc (modified) (2 diffs)

code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc

@@ -59 +59 @@
     HUDPickupItem::~HUDPickupItem()
     {
-        if (this->isInitialized())
+        /*if (this->isInitialized())
         {
             overlayElement_=nullptr;
-        }
+        }*/
     }
 
@@ -79 +79 @@
         assert(this->background_);
         overlayElement_->hide();
-        this->background_->removeChild(overlayElement_->getName());
+        //this->background_->removeChild(overlayElement_->getName());
     }
 }

code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc

@@ -56 +56 @@
     HUDPickupSystem::~HUDPickupSystem()
     {
-        if (this->isInitialized())
+        /*if (this->isInitialized())
         {
             this->picks.clear();
-        }
+        }*/
     }
 
@@ -107 +107 @@
     {
         assert(pickup);
+        orxout()<< "removePickup called with " << pickup << endl;
         HUDPickupItem* item = this->picks.find(pickup)->second;
-        orxout(internal_info, context::pickups) << "removePickup: pickup= " << pickup << " item= " << item << endl;
-        assert(item);
+        orxout() << "removePickup: pickup= " << pickup << " item= " << item << endl;
+        //assert(item);
         item->hideMe(pickup, repaint);
-        assert(overlayElement_);
-        assert(this->background_);
-        this->picks.erase(pickup);
+        orxout() << "i am hidden now" << endl;
+        //assert(overlayElement_);
+        //assert(this->background_);
+        //this->picks.erase(pickup);
+        orxout()<< "end removePickup method" << endl;
     }
 

code/branches/HUD_HS16/src/modules/pickup/PickupManager.cc

@@ -103 +103 @@
         // Destroying all the WeakPointers that are still there.
         this->pickups_.clear();
-
         this->indexes_.clear();
 
-        orxout(internal_info, context::pickups) << "PickupManager destroyed." << endl;
+        orxout() << "PickupManager destroyed." << endl;
     }
 
@@ -317 +316 @@
             if(pickupSystem)
                 pickupSystem->removePickup(pickup);
+            orxout() << "end of pickupChangedPickedUp" << endl;
         }
 

code/branches/HUD_HS16/src/orxonox/interfaces/Pickupable.cc

@@ -80 +80 @@
         if(this->isPickedUp())
             this->drop(false); // Drops the pickup without creating a PickupSpawner.
+        orxout()<< "end of preDestroy" << endl;
     }
 
@@ -98 +99 @@
     void Pickupable::destroyPickup(void)
     {
+        orxout()<< "beginning of actual destroy" << endl;
         if(!this->isBeingDestroyed())
             this->Destroyable::destroy();
         else
             orxout(internal_warning, context::pickups) << this->getIdentifier()->getName() << " may be unsafe. " << endl;
+        orxout()<<"end of actual destroy" << endl;
     }