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

Timestamp:

Jan 21, 2016, 1:59:04 PM (8 years ago)

Author:

muemart

Message:

Fix some clang-tidy warnings.
Also, Serialise.h was doing some C-style casts that ended up being const casts. I moved those const casts as close to the source as possible and changed the loadAndIncrease functions to not do that.

File:

• code/trunk/src/modules/pickup/items/ShrinkPickup.cc (modified) (1 diff)

code/trunk/src/modules/pickup/items/ShrinkPickup.cc

@@ -277 +277 @@
             {
                 Pawn* pawn = this->carrierToPawnHelper();
-                if(pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+                if (pawn == nullptr) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
+                {
                     this->Pickupable::destroy();
+                    return;
+                }
 
                 this->timeRemainig_ -= dt;