Changeset 10041 for code/branches/pickupsFS14/src/modules/jump/JumpPlatform.cc

Timestamp:

Apr 22, 2014, 5:32:37 PM (10 years ago)

Author:

fvultier

Message:

Level wird zufaellig generiert, HUD funktionier(Punkte werden angezeigt), Diverse bugs behoben, Figur springt von allen Platformen korrekt ab.

File:

• code/branches/pickupsFS14/src/modules/jump/JumpPlatform.cc (modified) (6 diffs)

code/branches/pickupsFS14/src/modules/jump/JumpPlatform.cc

@@ -36 +36 @@
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-
+#include "graphics/Model.h"
 #include "gametypes/Gametype.h"
 
@@ -86 +86 @@
         this->setVelocity(Vector3(0,0,0));
         this->setAcceleration(Vector3(0,0,0));
+
+        model = NULL;
     }
 
@@ -94 +96 @@
     JumpPlatform::~JumpPlatform()
     {
-        if (this->isInitialized())
+        /*if (this->isInitialized())
         {
             if (this->bDeleteBats_)
@@ -100 +102 @@
 
             delete[] this->batID_;
-        }
+        }*/
     }
 
@@ -137 +139 @@
 
         Vector3 platformPosition = this->getPosition();
-        Vector3 platformVelocity = this->getVelocity();
 
         if (figure_ != NULL)
@@ -149 +150 @@
             }
         }
+
+