Changeset 12155 for code/branches/OrxoKart_HS18/src

Timestamp:

Dec 5, 2018, 12:23:30 PM (6 years ago)

Author:

emustafa

Message:

fixed speed

Location:

code/branches/OrxoKart_HS18/src/modules/orxokart

Files:

• OrxoKart.cc (modified) (1 diff)
• OrxoKart.h (modified) (2 diffs)

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.cc

@@ -180 +180 @@
         // Check if ship collided with the flag
         if(flag_->getCollided()){
-            OrxoKartKart* player = flag_->getObjectofCollision();
+            player = flag_->getObjectofCollision();
             if (level == 1)
                 player->setPosition(Vector3(s*0, 20, s*8.5));

code/branches/OrxoKart_HS18/src/modules/orxokart/OrxoKart.h

@@ -42 +42 @@
 #include "gametypes/Gametype.h"
 #include "OrxoKartOrigin.h"
-
+#include "OrxoKartKart.h"
 namespace orxonox
 {
@@ -61 +61 @@
 
         private:
+            OrxoKartKart* player;
             WeakPtr<OrxoKartOrigin> origin_;
             OrxoKartFlag* flag_;