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

Timestamp:

May 11, 2017, 3:18:27 PM (7 years ago)

Author:

jkindle

Message:

Added the animation for the level end (walk into castle), Coins for the blocks, Castleblocks and Flagblocks

File:

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

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

@@ -21 +21 @@
  *
  *   Author:
- *      Fabien Vultier
+ *      Julien Kindle
  *   Co-authors:
- *      ...
+ *      
  *
  */
@@ -29 +29 @@
 /**
     @file SOBMushroom.cc
-    @brief All items in this minigame inherit from this class. Items can move around like platforms and enemies.
+    @brief This is the class for the powerup mushroom
 */
 
@@ -77 +77 @@
 
 
-if (changeAllowed_ && otherObject->getMass() != -1) {
+        if (changeAllowed_ && otherObject->getMass() != -1) {
                 goesRight_ = !goesRight_;
                 changeAllowed_ = false;
-}
+        }
 
-orxout() << "Watshc bum baem" << otherObject->getMass()<< endl;
-return true;
+        return true;
     }
 
@@ -92 +91 @@
     }
 
-    void SOBMushroom::touchFigure()
-    {
 
-    }
 
     void SOBMushroom::tick(float dt)
@@ -101 +97 @@
         SUPER(SOBMushroom, tick, dt);
 
+        //Exactly like the Gumba class, if collided, turn direction of Mushroom and wait 200ms so we don't get two collisions from the same wall
         if (!changeAllowed_) {
             changedOn_+= dt;
-            if (changedOn_> 200) {
+            if (changedOn_> 0.200) {
                 changeAllowed_ = true;
                 changedOn_ = 0.0;