Changeset 9318 for code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.h

Timestamp:

Jul 18, 2012, 10:36:24 PM (13 years ago)

Author:

landauf

Message:

removed PickupIdentifier for a number of reasons (I talked to Damian about it before)
a pickup now references the PickupRepresentation by name with the "representation" attribute

File:

• code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.h (modified) (2 diffs)

code/branches/presentation2012merge/src/modules/pickup/items/ShrinkPickup.h

@@ -119 +119 @@
                 { if(speed <= 0.0f) { orxout(internal_warning, context::pickups) << "Invalid shrink duration in ShrinkPickup. Ignoring.." << endl; return; } this->shrinkDuration_ = speed; }
 
-        protected:
-            void initializeIdentifier(void);
-
         private:
             void initialize(void);
@@ -135 +132 @@
             float currentFactor_;       //!< The shrink factor that is currently applied.
             float timeRemainig_;        //!< The remaining shrink time.
-            
+
             Pawn* carrierToPawnHelper(void);
             Timer durationTimer_;