Changeset 11700 for code/trunk/src/orxonox

Timestamp:

Jan 6, 2018, 12:15:25 AM (7 years ago)

Author:

landauf

Message:

merged the remaining commits of HUD_HS16 branch back to trunk (except commit r11392 which added DDDialogue that seems to be just a test)

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/interfaces/Pickupable.cc (modified) (2 diffs)

code/trunk/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;
     }