Changeset 7162 for code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc

Timestamp:

Aug 8, 2010, 8:53:52 PM (14 years ago)

Author:

dafrick

Message:

Significant structural changes to the pickup module. Lots of bugs found and fixed.
Introduced a new class CollectiblePickup (which is now the only kind a PickupCollection can consist of) to solve some issues cleanly.
MetaPickup received additional functionality. It can now also be set to either destroy all the pickups of a PickupCarrier or destroy the PickupCarrier itself. (This was done mainly for testing purposes)
I've done some extensive testing on the pickups, so they should really work now.

File:

• code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc (modified) (1 diff)

code/branches/presentation3/src/orxonox/gametypes/Dynamicmatch.cc

@@ -102 +102 @@
 
     bool Dynamicmatch::allowPawnDamage(Pawn* victim, Pawn* originator)
-    { //TODO: static and fading message for the "human" player's
+    {
+        //TODO: static and fading message for the "human" player's
         if (!originator||!victim)
             return false;