Changeset 6524 for code/trunk/src/modules

Timestamp:

Mar 15, 2010, 3:27:09 PM (16 years ago)

Author:

dafrick

Message:

Merged pickup branch into trunk. Yay. Persisting bugs will be fixed, very soon.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/pickup (copied) (copied from code/branches/pickup3/src/modules/pickup)
• src/modules/pickup/CMakeLists.txt (copied) (copied from code/branches/pickup3/src/modules/pickup/CMakeLists.txt)
• src/modules/pickup/DroppedPickup.cc (copied) (copied from code/branches/pickup3/src/modules/pickup/DroppedPickup.cc)
• src/modules/pickup/DroppedPickup.h (copied) (copied from code/branches/pickup3/src/modules/pickup/DroppedPickup.h)
• src/modules/pickup/Pickup.cc (copied) (copied from code/branches/pickup3/src/modules/pickup/Pickup.cc)
• src/modules/pickup/Pickup.h (copied) (copied from code/branches/pickup3/src/modules/pickup/Pickup.h)
• src/modules/pickup/PickupCollection.cc (copied) (copied from code/branches/pickup3/src/modules/pickup/PickupCollection.cc)
• src/modules/pickup/PickupCollection.h (copied) (copied from code/branches/pickup3/src/modules/pickup/PickupCollection.h)
• src/modules/pickup/PickupCollectionIdentifier.cc (copied) (copied from code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.cc)
• src/modules/pickup/PickupCollectionIdentifier.h (copied) (copied from code/branches/pickup3/src/modules/pickup/PickupCollectionIdentifier.h)
• src/modules/pickup/PickupManager.cc (copied) (copied from code/branches/pickup3/src/modules/pickup/PickupManager.cc)
• src/modules/pickup/PickupManager.h (copied) (copied from code/branches/pickup3/src/modules/pickup/PickupManager.h)
• src/modules/pickup/PickupPrecompiledHeaders.h (copied) (copied from code/branches/pickup3/src/modules/pickup/PickupPrecompiledHeaders.h)
• src/modules/pickup/PickupPrereqs.h (copied) (copied from code/branches/pickup3/src/modules/pickup/PickupPrereqs.h)
• src/modules/pickup/PickupRepresentation.cc (copied) (copied from code/branches/pickup3/src/modules/pickup/PickupRepresentation.cc)
• src/modules/pickup/PickupRepresentation.h (copied) (copied from code/branches/pickup3/src/modules/pickup/PickupRepresentation.h)
• src/modules/pickup/PickupSpawner.cc (copied) (copied from code/branches/pickup3/src/modules/pickup/PickupSpawner.cc)
• src/modules/pickup/PickupSpawner.h (copied) (copied from code/branches/pickup3/src/modules/pickup/PickupSpawner.h)
• src/modules/pickup/items (copied) (copied from code/branches/pickup3/src/modules/pickup/items)
• src/modules/pickup/items/CMakeLists.txt (copied) (copied from code/branches/pickup3/src/modules/pickup/items/CMakeLists.txt)
• src/modules/pickup/items/HealthPickup.cc (copied) (copied from code/branches/pickup3/src/modules/pickup/items/HealthPickup.cc)
• src/modules/pickup/items/HealthPickup.h (copied) (copied from code/branches/pickup3/src/modules/pickup/items/HealthPickup.h)
• src/modules/pickup/items/MetaPickup.cc (copied) (copied from code/branches/pickup3/src/modules/pickup/items/MetaPickup.cc)
• src/modules/pickup/items/MetaPickup.h (copied) (copied from code/branches/pickup3/src/modules/pickup/items/MetaPickup.h)
• src/modules/weapons/projectiles/Projectile.cc (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.cc (modified) (1 diff)

code/trunk/src/modules/CMakeLists.txt

@@ -29 +29 @@
 ADD_SUBDIRECTORY(objects)
 ADD_SUBDIRECTORY(overlays)
+ADD_SUBDIRECTORY(pickup)
 ADD_SUBDIRECTORY(pong)
 ADD_SUBDIRECTORY(questsystem)

code/trunk/src/modules/weapons/projectiles/Projectile.cc

@@ -124 +124 @@
 
             float dmg = this->damage_;
-            if (this->owner_)
-                dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
+            //TODO: Remove.
+//             if (this->owner_)
+//                 dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
 
             Pawn* victim = orxonox_cast<Pawn*>(otherObject);

code/trunk/src/modules/weapons/projectiles/Rocket.cc

@@ -201 +201 @@
 
             float dmg = this->damage_;
-            if (this->owner_)
-                dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
+            //TODO: This souldn't be necessary here.
+            //if (this->owner_)
+            //    dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
 
             Pawn* victim = orxonox_cast<Pawn*>(otherObject);