Changeset 7073 for code/branches/presentation3/src/orxonox/worldentities/pawns

Timestamp:

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

Author:

landauf

Message:

merged fps branch to presentation3

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/pawns/FpsPlayer.cc (copied) (copied from code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.cc) (1 prop)
• src/orxonox/worldentities/pawns/FpsPlayer.h (copied) (copied from code/branches/fps/src/orxonox/worldentities/pawns/FpsPlayer.h) (1 prop)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/presentation3/src/orxonox/worldentities/pawns/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
+  FpsPlayer.cc
   Spectator.cc
   Pawn.cc

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);
+        }
     }
 

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

@@ -101 +101 @@
             void addWeaponPackXML(WeaponPack * wPack);
             WeaponPack * getWeaponPack(unsigned int index) const;
+            
+            virtual void addedWeaponPack(WeaponPack* wPack) {}
 
             inline const WorldEntity* getWorldEntity() const