Changeset 11412 for code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBMushroom.cc

Timestamp:

May 4, 2017, 3:17:59 PM (8 years ago)

Author:

jkindle

Message:

Fixed turning, added and finished Gumbas, added turnOnCollide for all NPC and items, added Flagstone - todo: add points on flagstone hit and go into a between lvl mode, then warp to lvl 2. AAH, and added onDeath fcts…

File:

• code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBMushroom.cc (modified) (3 diffs)

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBMushroom.cc

@@ -55 +55 @@
         speed_ = 0.0;
         hasCollided_=false;
+        goesRight_ = true;
+        lastPos_ = getPosition();
+        lastPos_.x -= 20;
+        changeAllowed_ = true;
+        changedOn_ = 0.0;
        
     }
@@ -71 +76 @@
     bool SOBMushroom::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) {
 
-//orxout() << "Watshc bum baem" << endl;
+
+if (changeAllowed_ && otherObject->getMass() != -1) {
+                goesRight_ = !goesRight_;
+                changeAllowed_ = false;
+}
+
+orxout() << "Watshc bum baem" << otherObject->getMass()<< endl;
 return true;
     }
@@ -90 +101 @@
         SUPER(SOBMushroom, tick, dt);
 
-          Vector3 velocity = getVelocity();
+        if (!changeAllowed_) {
+            changedOn_+= dt;
+            if (changedOn_> 200) {
+                changeAllowed_ = true;
+                changedOn_ = 0.0;
+
+        }
+    }
+        
+
+        int dir = 1;
+        if (!goesRight_)
+            dir = -1;
+
+        Vector3 velocity = getVelocity();
         velocity.z -= gravityAcceleration_*dt;
-        velocity.x = speed_;
+        velocity.x = dir*speed_;
         setVelocity(velocity);
 
 
     
+        lastPos_ = getPosition();
+            }
+
 
 }
-}