[Orxonox-commit 1802] r6520 - in code/branches/pickup3: data/levels src/modules/pickup/items

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-03-14 10:27:41 +0100 (Sun, 14 Mar 2010)
New Revision: 6520

Modified:
   code/branches/pickup3/data/levels/pickup.oxw
   code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc
Log:
Small fix in HealthPickup.


Modified: code/branches/pickup3/data/levels/pickup.oxw
===================================================================
--- code/branches/pickup3/data/levels/pickup.oxw	2010-03-13 14:32:34 UTC (rev 6519)
+++ code/branches/pickup3/data/levels/pickup.oxw	2010-03-14 09:27:41 UTC (rev 6520)
@@ -36,7 +36,7 @@
 
     <PickupSpawner position="-50,0,-100" triggerDistance="10" respawnTime="30" maxSpawnedItems="10">
         <pickup>
-            <HealthPickup health=50 healthRate=5 durationType=continuous activationType=onUse healthType=permanent />
+            <HealthPickup health=50 healthRate=5 durationType=continuous activationType=immediate healthType=permanent />
         </pickup>
     </PickupSpawner>
     

Modified: code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc
===================================================================
--- code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc	2010-03-13 14:32:34 UTC (rev 6519)
+++ code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc	2010-03-14 09:27:41 UTC (rev 6520)
@@ -149,7 +149,7 @@
             switch(this->getHealthTypeDirect())
             {
                 case pickupHealthType::permanent:
-                    if(pawn->getMaxHealth() > fullHealth)
+                    if(pawn->getMaxHealth() < fullHealth)
                         pawn->setMaxHealth(fullHealth);
                 case pickupHealthType::limited:
                     pawn->addHealth(health);