Changeset 9195 for code/branches/presentation2012/src/modules

Timestamp:

May 18, 2012, 2:58:33 PM (13 years ago)

Author:

smerkli

Message:

merged branch pickup2012

Location:

code/branches/presentation2012

Files:

• . (modified) (1 prop)
• src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
• src/modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup/items/DamageBoostPickup.cc (copied) (copied from code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.cc)
• src/modules/pickup/items/DamageBoostPickup.h (copied) (copied from code/branches/pickup2012/src/modules/pickup/items/DamageBoostPickup.h)
• src/modules/pickup/items/SpeedPickup.h (modified) (1 diff)

code/branches/presentation2012/src/modules/pickup/PickupPrereqs.h

@@ -86 +86 @@
     class ShieldPickup;
     class ShrinkPickup;
-
+    class DamageBoostPickup;
 }
 

code/branches/presentation2012/src/modules/pickup/items/CMakeLists.txt

@@ -7 +7 @@
   ShieldPickup.cc
   ShrinkPickup.cc
+  DamageBoostPickup.cc
 )

code/branches/presentation2012/src/modules/pickup/items/SpeedPickup.h

@@ -112 +112 @@
         private:
             void initialize(void); //!< Initializes the member variables.
-            SpaceShip* carrierToSpaceShipHelper(void); //!< Helper to transform the PickupCarrier to a SpaceSHip, and throw an error message if the conversion fails.
+            SpaceShip* carrierToSpaceShipHelper(void); //!< Helper to transform the PickupCarrier to a SpaceShip, and throw an error message if the conversion fails.
 
             Timer durationTimer_; //!< Timer.