Changeset 7073 for code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc

Timestamp:

Jun 2, 2010, 12:02:50 AM (15 years ago)

Author:

landauf

Message:

merged fps branch to presentation3

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc

@@ -363 +363 @@
     {
         if (this->weaponSystem_)
+        {
             this->weaponSystem_->addWeaponPack(wPack);
+            this->addedWeaponPack(wPack);
+        }
     }
 
@@ -369 +372 @@
     {
         if (this->weaponSystem_)
+        {
             if (!this->weaponSystem_->addWeaponPack(wPack))
                 wPack->destroy();
+            else
+                this->addedWeaponPack(wPack);
+        }
     }