Changeset 11783 for code/trunk/src/orxonox/worldentities/pawns

Timestamp:

Feb 20, 2018, 12:14:40 AM (7 years ago)

Author:

landauf

Message:

merged Presentation_HS17_merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (3 diffs)
• src/orxonox/worldentities/pawns/ShootableObstacle.cc (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.cc)
• src/orxonox/worldentities/pawns/ShootableObstacle.h (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/ShootableObstacle.h)
• src/orxonox/worldentities/pawns/StoryModePawn.cc (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.cc)
• src/orxonox/worldentities/pawns/StoryModePawn.h (copied) (copied from code/branches/Presentation_HS17_merge/src/orxonox/worldentities/pawns/StoryModePawn.h)

code/trunk/src/orxonox/worldentities/pawns/CMakeLists.txt

@@ -7 +7 @@
   TeamBaseMatchBase.cc
   Destroyer.cc
+  StoryModePawn.cc
+  ShootableObstacle.cc
 )

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -84 +84 @@
         // set damage multiplier to default value 1, meaning nominal damage
         this->damageMultiplier_ = 1;
+        this->acceptsPickups_ = true;
 
         this->spawnparticleduration_ = 3.0f;

code/trunk/src/orxonox/worldentities/pawns/Pawn.h

@@ -199 +199 @@
                 { return this->damageMultiplier_; }
 
+            // Some pawns can-t harvest pickups (e.g. AsteroidMinables). Checked in PickupSpawner. 
+            inline void setPickupAcceptance(bool b)
+                { this->acceptsPickups_ = b; }
+            inline bool doesAcceptPickups()
+                { return this->acceptsPickups_;}
 
             virtual void startLocalHumanControl() override;
@@ -218 +223 @@
                 { return this->weaponSystem_; }
 
-            static void consoleCommand_debugDrawWeapons(bool bDraw);
+            static void consoleCommand_debugDrawWeapons(bool bDraw); 
+
+
 
         protected:
@@ -256 +263 @@
 
             float damageMultiplier_; ///< Used by the Damage Boost Pickup.
+            bool acceptsPickups_; // Added for the asteroidMinable class, avoid that they attempt to grab the resources
 
             WeakPtr<Pawn> lastHitOriginator_;