Changeset 9297

Timestamp:

Jun 14, 2012, 11:10:06 PM (12 years ago)

Author:

landauf

Message:

• fixed crash on closing pickup inventory. happened if pickup inventory and detail window were closed with ESC which didn't clean up the detail window properly. the next time the pickup inventory was opened and closed, the game crashed.
• cleaned up a detail in PickupCollectionIdentifier

Location:

code/branches/presentation2012merge

Files:

• data/gui/scripts/PickupInventory.lua (modified) (2 diffs)
• src/modules/pickup/PickupCollectionIdentifier.cc (modified) (1 diff)

code/branches/presentation2012merge/data/gui/scripts/PickupInventory.lua

@@ -176 +176 @@
     for k,v in pairs(P.detailsWindows) do
         if v ~= nil then
-            winMgr:destroyWindow(v)
+            P.destroyDetailWindow(k)
         end
     end
@@ -323 +323 @@
     local detailNr = tonumber(match())
     
+    P.destroyDetailWindow(detailNr)
+end
+
+function P.destroyDetailWindow(detailNr)
     local window = P.detailsWindows[detailNr]
     winMgr:destroyWindow(window)

code/branches/presentation2012merge/src/modules/pickup/PickupCollectionIdentifier.cc

@@ -72 +72 @@
         assert(identifier);
 
-        // Slight un-niceity to cast the const PickupIdentifier to a const PickupCollectionIdentifier, but since we cast to a const, there is no harm done.
-        PickupIdentifier* temp = const_cast<PickupIdentifier*>(identifier);
-        const PickupCollectionIdentifier* collectionIdentifier = orxonox_cast<PickupCollectionIdentifier*>(temp);
+        const PickupCollectionIdentifier* collectionIdentifier = orxonox_cast<const PickupCollectionIdentifier*>(identifier);
 
         // If the input PickupIdentifier 'identifier' is no PickupCollectionIdentifier then just the two PickupIdentifiers are compared.