Changeset 11736 for code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h

Timestamp:

Feb 11, 2018, 10:31:46 PM (6 years ago)

Author:

landauf

Message:

[AsteroidMining_HS17] some cleanup - Field and Belt should not depend on Pawn, should not be synchronized either (server-side logic). also removed additional constructors and replaced with regular setters.

File:

• code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h (modified) (2 diffs)

code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.h

@@ -76 +76 @@
 #include "AsteroidMiningPrereqs.h"
 
-#include <string>
-#include <vector>
-#include "interfaces/PickupCarrier.h"
-#include "interfaces/RadarViewable.h"
-#include "worldentities/ControllableEntity.h"
-#include "worldentities/ExplosionPart.h"
-
-#include "../../orxonox/worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox{
 
 
-    class _AsteroidMiningExport AsteroidMinable : public Pawn{
+    class _AsteroidMiningExport AsteroidMinable : public Pawn
+    {
+        public:
+            AsteroidMinable(Context* context);
+            virtual ~AsteroidMinable();
 
-        public:
-            // @brief This constructor is for XML access only!
-            AsteroidMinable(Context* context);
-            // @brief Call this Constructor from other C-files.
-            AsteroidMinable(Context* c, float size, Vector3 position, bool dS);
-
-            virtual ~AsteroidMinable();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void tick(float dt) override;
 
@@ -105 +94 @@
             virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, const btCollisionShape* cs, float damage, float healthdamage = 0.0f, float shielddamage = 0.0f);
 
-            inline void setSize(int s){this->size = s;}
+            void setSize(int s);
             inline int getSize(){return this->size;}
 
-            inline void toggleShattering(bool b){this->generateSmaller = b;}
+            inline void setShattering(bool b){this->generateSmaller = b;}
             inline bool doesShatter(){return this->generateSmaller;}
 
-            inline void toggleDropStuff(bool b){this->dropStuff = b;}
+            inline void setDropStuff(bool b){this->dropStuff = b;}
             inline bool doesDropStuff(){return this->dropStuff;}
 
         protected:
-
-            Context* context;
 
             int size; //!< Implies health and type of dropped pickups