Changeset 11609 for code/branches/AsteroidMining_HS17/src/orxonox

Timestamp:

Nov 27, 2017, 6:53:05 PM (7 years ago)

Author:

remartin

Message:

Solved pickup problem with tiny adaptation in Pawn.h and PickupSpawner.cc. Started work on SpicedAsteroidField.

Location:

code/branches/AsteroidMining_HS17/src/orxonox/worldentities/pawns

Files:

• Pawn.cc (modified) (1 diff)
• Pawn.h (modified) (3 diffs)

code/branches/AsteroidMining_HS17/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/branches/AsteroidMining_HS17/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_;