Changeset 11700 for code/trunk/src/modules/pickup

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/modules/pickup/PickupManager.cc (modified) (4 diffs)

code/trunk/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;
     }
 
@@ -266 +265 @@
         assert(pickup);
 
+        orxout() << "just got called"<<endl;
         for (HUDPickupSystem* hud : ObjectList<HUDPickupSystem>())
             pickupSystem = hud;
@@ -300 +300 @@
 
             if(pickupSystem)
-                pickupSystem->updatePickupList(picks, indexes_);
+                pickupSystem->sync(picks, indexes_);
             
         }
@@ -316 +316 @@
 
             if(pickupSystem)
-                pickupSystem->removePickup(pickup);
+                pickupSystem->sync(picks, indexes_);
+            orxout() << "end of pickupChangedPickedUp" << endl;
         }