Changeset 10074 for code/branches/pickupsFS14/src/modules/jump/JumpEnemy.cc

Timestamp:

May 22, 2014, 3:05:46 PM (10 years ago)

Author:

fvultier

Message:

new items added. improved level generator.

File:

• code/branches/pickupsFS14/src/modules/jump/JumpEnemy.cc (modified) (4 diffs)

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

@@ -56 +56 @@
         RegisterObject(JumpEnemy);
 
-        this->figure_ = 0;
+        dead_ = false;
+        figure_ = 0;
+        width_ = 0.0;
+        height_ = 0.0;
+        setPosition(Vector3(0,0,0));
+        setVelocity(Vector3(0,0,0));
+        setAcceleration(Vector3(0,0,0));
         setProperties(0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
-        this->setPosition(Vector3(0,0,0));
-        this->setVelocity(Vector3(0,0,0));
-        this->setAcceleration(Vector3(0,0,0));
     }
 
@@ -82 +85 @@
     {
         SUPER(JumpEnemy, XMLPort, xmlelement, mode);
+
+        XMLPortParam(JumpEnemy, "height", setHeight, getHeight, xmlelement, mode);
+        XMLPortParam(JumpEnemy, "width", setWidth, getWidth, xmlelement, mode);
     }
 
@@ -116 +122 @@
 
 
+        // Interact with Figure
+        Vector3 enemyPosition = getPosition();
+
+        if (figure_ != NULL)
+        {
+            Vector3 figurePosition = figure_->getPosition();
+            if(figurePosition.x > enemyPosition.x-width_ && figurePosition.x < enemyPosition.x+width_ && figurePosition.z > enemyPosition.z-height_ && figurePosition.z < enemyPosition.z+height_)
+            {
+                touchFigure();
+            }
+        }
     }
 
@@ -141 +158 @@
     void JumpEnemy::touchFigure()
     {
-
+        if (dead_ == false)
+        {
+                figure_->CollisionWithEnemy(this);
+        }
     }
 }