Changeset 10184 for code/branches/pickupsFS14/src/modules/jump/JumpFigure.cc

Timestamp:

Dec 17, 2014, 3:43:07 PM (9 years ago)

Author:

fvultier

Message:

Es wird nun angezeigt, wie lange ein item noch aktiv ist.

File:

• code/branches/pickupsFS14/src/modules/jump/JumpFigure.cc (modified) (10 diffs)

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

@@ -70 +70 @@
         animateHands_ = false;
         turnUp_ = false;
-        rocketActive_ = false;
-        propellerActive_ = false;
-        bootsActive_ = false;
-        shieldActive_ = false;
+        rocketActive_ = NULL;
+        propellerActive_ = NULL;
+        bootsActive_ = NULL;
+        shieldActive_ = NULL;
         rocketSpeed_ = 0.0;
         propellerSpeed_ = 0.0;
@@ -106 +106 @@
                 // Move up/down
                 Vector3 velocity = getVelocity();
-                if (rocketActive_ == true)
+                if (rocketActive_ != NULL)
                 {
                         velocity.z = rocketSpeed_;
                 }
-                else if (propellerActive_ == true)
+                else if (propellerActive_ != NULL)
                 {
                         velocity.z = propellerSpeed_;
@@ -207 +207 @@
         {
                 Vector3 velocity = getVelocity();
-                velocity.z = (bootsActive_ ? 1.2*jumpSpeed_ : jumpSpeed_);
+            if (bootsActive_ == NULL)
+            {
+                velocity.z = 1.2*jumpSpeed_;
+            }
+            else
+            {
+                velocity.z = jumpSpeed_;
+            }
                 setVelocity(velocity);
-
                 animateHands_ = true;
                 handAngle_ = 0.0;
@@ -228 +234 @@
     void JumpFigure::CollisionWithEnemy(JumpEnemy* enemy)
         {
-        if (rocketActive_ == false && propellerActive_ == false && shieldActive_ == false)
+        if (rocketActive_ == NULL && propellerActive_ == NULL && shieldActive_ == NULL)
                 {
                         dead_ = true;
@@ -236 +242 @@
     bool JumpFigure::StartRocket(JumpRocket* rocket)
     {
-        if (rocketActive_ == false && propellerActive_ == false && bootsActive_ == false)
+        if (rocketActive_ == NULL && propellerActive_ == NULL && bootsActive_ == NULL)
         {
                 attach(rocket);
                 rocket->setPosition(0.0, rocketPos_, 0.0);
                 rocket->setVelocity(0.0, 0.0, 0.0);
-                rocketActive_ = true;
+                rocketActive_ = rocket;
 
                 return true;
@@ -255 +261 @@
         detach(rocket);
                 rocket->destroy();
-                rocketActive_ = false;
+                rocketActive_ = NULL;
     }
 
     bool JumpFigure::StartPropeller(JumpPropeller* propeller)
     {
-        if (rocketActive_ == false && propellerActive_ == false && bootsActive_ == false)
+        if (rocketActive_ == NULL && propellerActive_ == NULL && bootsActive_ == NULL)
         {
                 attach(propeller);
                 propeller->setPosition(0.0, 0.0, propellerPos_);
                 propeller->setVelocity(0.0, 0.0, 0.0);
-                propellerActive_ = true;
+                propellerActive_ = propeller;
 
                 return true;
@@ -279 +285 @@
         detach(propeller);
         propeller->destroy();
-        propellerActive_ = false;
+        propellerActive_ = NULL;
     }
 
     bool JumpFigure::StartBoots(JumpBoots* boots)
     {
-        if (rocketActive_ == false && propellerActive_ == false && bootsActive_ == false)
+        if (rocketActive_ == NULL && propellerActive_ == NULL && bootsActive_ == NULL)
         {
                 attach(boots);
                 boots->setPosition(0.0, 0.0, bootsPos_);
                 boots->setVelocity(0.0, 0.0, 0.0);
-                bootsActive_ = true;
+                bootsActive_ = boots;
 
                 return true;
@@ -303 +309 @@
         detach(boots);
         boots->destroy();
-        bootsActive_ = false;
+        bootsActive_ = NULL;
     }
 
@@ -313 +319 @@
                 shield->setPosition(0.0, 0.0, propellerPos_);
                 shield->setVelocity(0.0, 0.0, 0.0);
-                shieldActive_ = true;
+                shieldActive_ = shield;
 
                 return true;
@@ -327 +333 @@
         detach(shield);
         shield->destroy();
-        shieldActive_ = false;
+        shieldActive_ = NULL;
     }