Changeset 10624 for code/trunk/src/modules/jump

Timestamp:

Oct 4, 2015, 9:12:21 PM (9 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/jump/CMakeLists.txt (modified) (1 diff)
• src/modules/jump/JumpCenterpoint.cc (modified) (1 diff)
• src/modules/jump/JumpCenterpoint.h (modified) (1 diff)
• src/modules/jump/JumpEnemy.cc (modified) (1 diff)
• src/modules/jump/JumpEnemy.h (modified) (1 diff)
• src/modules/jump/JumpItem.cc (modified) (1 diff)
• src/modules/jump/JumpItem.h (modified) (1 diff)
• src/modules/jump/JumpPlatform.cc (modified) (1 diff)
• src/modules/jump/JumpPlatform.h (modified) (1 diff)
• src/modules/jump/JumpProjectile.cc (modified) (1 diff)
• src/modules/jump/JumpProjectile.h (modified) (1 diff)
• src/modules/jump/JumpScore.cc (modified) (1 diff)

code/trunk/src/modules/jump/CMakeLists.txt

@@ -24 +24 @@
 
 ORXONOX_ADD_LIBRARY(jump
-  MODULE
+  PLUGIN
   FIND_HEADER_FILES
   LINK_LIBRARIES

code/trunk/src/modules/jump/JumpCenterpoint.cc

@@ -80 +80 @@
     }
 
-    void JumpCenterpoint::changedGametype()
-    {
-        SUPER(JumpCenterpoint, changedGametype);
-
-        checkGametype();
-    }
-
     void JumpCenterpoint::checkGametype()
     {
         if (getGametype() != NULL && this->getGametype()->isA(Class(Jump)))
         {
-            Jump* jumpGametype = orxonox_cast<Jump*>(this->getGametype().get());
+            Jump* jumpGametype = orxonox_cast<Jump*>(this->getGametype());
             jumpGametype->setCenterpoint(this);
         }

code/trunk/src/modules/jump/JumpCenterpoint.h

@@ -114 +114 @@
             virtual ~JumpCenterpoint() {}
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a JumpCenterpoint through XML.
-            virtual void changedGametype();
             void setPlatformStaticTemplate(const std::string& balltemplate)
                 { this->platformStaticTemplate_ = balltemplate; }

code/trunk/src/modules/jump/JumpEnemy.cc

@@ -151 +151 @@
         An array (of size 2) of weak pointers, to be set as the new bats.
     */
-    void JumpEnemy::setFigure(WeakPtr<JumpFigure> newFigure)
+    void JumpEnemy::setFigure(JumpFigure* newFigure)
     {
         figure_ = newFigure;

code/trunk/src/modules/jump/JumpEnemy.h

@@ -68 +68 @@
 
             virtual void setProperties(float newLeftBoundary, float newRightBoundary, float newLowerBoundary, float newUpperBoundary, float newHSpeed, float newVSpeed);
-            void setFigure(WeakPtr<JumpFigure> bats);
+            void setFigure(JumpFigure* newFigure);
             virtual void touchFigure();
             bool dead_;

code/trunk/src/modules/jump/JumpItem.cc

@@ -109 +109 @@
     }
 
-    void JumpItem::setFigure(WeakPtr<JumpFigure> newFigure)
+    void JumpItem::setFigure(JumpFigure* newFigure)
     {
         figure_ = newFigure;

code/trunk/src/modules/jump/JumpItem.h

@@ -53 +53 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void setProperties(float newLeftBoundary, float newRightBoundary, float newLowerBoundary, float newUpperBoundary, float newHSpeed, float newVSpeed);
-            virtual void setFigure(WeakPtr<JumpFigure> bats);
+            virtual void setFigure(JumpFigure* newFigure);
             virtual void touchFigure();
 

code/trunk/src/modules/jump/JumpPlatform.cc

@@ -125 +125 @@
     }
 
-    void JumpPlatform::setFigure(WeakPtr<JumpFigure> newFigure)
+    void JumpPlatform::setFigure(JumpFigure* newFigure)
     {
         figure_ = newFigure;

code/trunk/src/modules/jump/JumpPlatform.h

@@ -49 +49 @@
             virtual void tick(float dt);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            void setFigure(WeakPtr<JumpFigure> bats); //!< Set the bats for the ball.
+            void setFigure(JumpFigure* newFigure);
             virtual void touchFigure();
 

code/trunk/src/modules/jump/JumpProjectile.cc

@@ -84 +84 @@
     }
 
-    void JumpProjectile::setFigure(WeakPtr<JumpFigure> figure)
+    void JumpProjectile::setFigure(JumpFigure* figure)
     {
         figure_ = figure;

code/trunk/src/modules/jump/JumpProjectile.h

@@ -56 +56 @@
                 { return Vector2(this->fieldWidth_, this->fieldHeight_); }
 
-            void setFigure(WeakPtr<JumpFigure> figure);
+            void setFigure(JumpFigure* figure);
 
         protected:

code/trunk/src/modules/jump/JumpScore.cc

@@ -118 +118 @@
         if (this->getOwner() != NULL && this->getOwner()->getGametype())
         {
-            this->owner_ = orxonox_cast<Jump*>(this->getOwner()->getGametype().get());
+            this->owner_ = orxonox_cast<Jump*>(this->getOwner()->getGametype());
         }
         else