Changeset 6998 for code/branches/presentation3/src/modules

Timestamp:

May 27, 2010, 11:50:24 PM (14 years ago)

Author:

dafrick

Message:

Merged pickup branch into presentation3 branch.
Seems to be working just fine so not much changes at all. (Except for some representations that had the parameters 'name' instead of 'pickupName' and 'description' instead of 'pickupDescription').

Location:

code/branches/presentation3

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/ShieldPickup.cc (copied) (copied from code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.cc)
• src/modules/pickup/items/ShieldPickup.h (copied) (copied from code/branches/ppspickups3/src/modules/pickup/items/ShieldPickup.h)

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

@@ -79 +79 @@
     class MetaPickup;
     class SpeedPickup;
+    class ShieldPickup;
 
 }

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

@@ -4 +4 @@
   MetaPickup.cc
   SpeedPickup.cc
+  ShieldPickup.cc
 )