[Orxonox-commit 3826] r8502 - in code/branches/pickup: data/levels src/modules/pickup/items

[dafrick at orxonox.net]

Author: dafrick
Date: 2011-05-18 12:36:59 +0200 (Wed, 18 May 2011)
New Revision: 8502

Modified:
   code/branches/pickup/data/levels/pickups.oxw
   code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc
   code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h
Log:

Minor changes.


Modified: code/branches/pickup/data/levels/pickups.oxw
===================================================================
--- code/branches/pickup/data/levels/pickups.oxw	2011-05-18 09:33:28 UTC (rev 8501)
+++ code/branches/pickup/data/levels/pickups.oxw	2011-05-18 10:36:59 UTC (rev 8502)
@@ -183,11 +183,11 @@
       </pickup>
     </PickupRepresentation>
 
-    <!--PickupSpawner position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
+    <PickupSpawner position="-50,0,-125" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
       <pickup>
         <HealthPickup health=500 activationType=immediate healthRate=10 durationType=continuous />
       </pickup>
-    </PickupSpawner-->
+    </PickupSpawner>
 
     <PickupSpawner position="-30,-30,-30" respawnTime="60" triggerDistance="20" maxSpawnedItems="5">
       <pickup>

Modified: code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc
===================================================================
--- code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc	2011-05-18 09:33:28 UTC (rev 8501)
+++ code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc	2011-05-18 10:36:59 UTC (rev 8502)
@@ -20,7 +20,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author:
- *      Damian 'Mozork' Frick
+ *      Sandro Sgier
  *   Co-authors:
  *      ...
  *
@@ -96,10 +96,6 @@
             isActive_ = true;
             durationTimer.setTimer(duration_, false, createExecutor(createFunctor(&ShrinkPickup::terminate, this)));
         }
-        else
-        {
-            this->Pickupable::destroy();
-        }
     }
 
     void ShrinkPickup::tick(float dt)
@@ -143,13 +139,15 @@
             }
         }
         else if(isTerminating_ == true)
-        setUsed(false);
+            this->Pickupable::destroy();
+
     }
 
     void ShrinkPickup::terminate(void)
     {
         isActive_ = false;
         isTerminating_ = true;
+        setUsed(false);
     }
 
     Pawn* ShrinkPickup::carrierToPawnHelper(void)

Modified: code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h
===================================================================
--- code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h	2011-05-18 09:33:28 UTC (rev 8501)
+++ code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h	2011-05-18 10:36:59 UTC (rev 8502)
@@ -20,7 +20,7 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  *   Author:
- *      Damian 'Mozork' Frick
+ *      Sandro Sgier
  *   Co-authors:
  *      ...
  *
@@ -86,4 +86,4 @@
     };
 }
 
-#endif
\ No newline at end of file
+#endif