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

Timestamp:

Jun 14, 2011, 8:53:28 PM (13 years ago)

Author:

dafrick

Message:

Merging presentation branch back into trunk.
There are many new features and also a lot of other changes and bugfixes, if you want to know, digg through the svn log.
Not everything is yet working as it should, but it should be fairly stable. If you habe any bug reports, just send me an email.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/pickup/PickupManager.h (modified) (1 diff)
• src/modules/pickup/PickupPrereqs.h (modified) (1 diff)
• src/modules/pickup/PickupRepresentation.cc (modified) (1 diff)
• src/modules/pickup/items/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup/items/ShrinkPickup.cc (copied) (copied from code/branches/presentation/src/modules/pickup/items/ShrinkPickup.cc)
• src/modules/pickup/items/ShrinkPickup.h (copied) (copied from code/branches/presentation/src/modules/pickup/items/ShrinkPickup.h)

code/trunk/src/modules/pickup/PickupManager.h

@@ -148 +148 @@
             @return Returns true if the input Pickupable is still valid, false if not.
             */
-            const bool isValidPickup(uint32_t pickup) const
+            bool isValidPickup(uint32_t pickup) const
                 { return this->pickups_.find(pickup) != this->pickups_.end(); }
             // tolua_end

code/trunk/src/modules/pickup/PickupPrereqs.h

@@ -85 +85 @@
     class SpeedPickup;
     class ShieldPickup;
+    class ShrinkPickup;
 
 }

code/trunk/src/modules/pickup/PickupRepresentation.cc

@@ -57 +57 @@
 
         this->initialize();
-        this->setSyncMode(0x0); // The default PickupRperesentation created by each PickupManager is not synchronised, since it only exists locally.
+        this->setSyncMode(ObjectDirection::None); // The default PickupRperesentation created by each PickupManager is not synchronised, since it only exists locally.
     }
 

code/trunk/src/modules/pickup/items/CMakeLists.txt

@@ -6 +6 @@
   SpeedPickup.cc
   ShieldPickup.cc
+  ShrinkPickup.cc
 )