Changeset 11412 for code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBHUDInfo.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/SOBHUDInfo.cc (modified) (2 diffs)

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

@@ -66 +66 @@
           if (this->type_ == "Coins") {
                 // this->setCaption("Game ends in 30 seconds.\nPress (e)xit / (q)uit to go to the main menu.\nTo restart fly out of the screen!");
-                    
-                    
+            
+            
             std::stringstream ss;
             ss << "cc x " << std::setw(2) << std::setfill('0') << SOBGame->getCoins();
@@ -74 +74 @@
             this->setCaption(s);
             
-          }
-           if (this->type_ == "Points") {
+        }
+        if (this->type_ == "Points") {
             std::stringstream ss;
             ss << std::setw(6) << std::setfill('0') << SOBGame->getPoints();
             std::string s = ss.str();
             this->setCaption(s);
-          }
-          if (this->type_ == "Time") {
+        }
+        if (this->type_ == "Time") {
             std::stringstream ss;
             ss << SOBGame->getTimeLeft();
             std::string s = ss.str();
             this->setCaption(s);
-          }
-               
+        }
+        if (this->type_ == "Info") {
+            std::stringstream ss;
+            ss << SOBGame->getInfoText();
+            std::string s = ss.str();
+            this->setCaption(s);
+        }
+        
 
-
-            //     const std::string& Level = multi_cast<std::string>(this->SOBGame->getLevel());
-            //     if (this->SOBGame->lives <= 0)
-            //     {
-            //         setPosition(Vector2(0.1, 0.65));
-            //         this->setCaption("Game ends in 30 seconds.\nPress (e)xit / (q)uit to go to the main menu.\nTo restart fly out of the screen!");
-            //         setTextSize(0.05);
-            //         this->SOBGame->bEndGame = true;
-            //     }
-            //     else if (this->SOBGame->bShowLevel)
-            //     {
-            //         setTextSize(0.1);
-            //         setPosition(Vector2(0.3, 0.55));
-            //         std::stringstream sstm;
-            //         sstm << "Level " << Level;
-            //         this->setCaption(sstm.str()); // + level
-            //     }
-            //     else
-            //     {
-            //         setTextSize(0.04);
-            //         setPosition(Vector2(0.14, 0.055));
-            //         this->setCaption(Level);
-            //     }
-            // ////////////
-            //     const std::string& points = multi_cast<std::string>(this->SOBGame->getPoints());
-            //     if (this->SOBGame->lives <= 0)
-            //     {
-            //         setTextSize(0.2);
-            //         setPosition(Vector2(0.1, 0.25));
-            //         this->setCaption("Final score:\n" + points);
-            //         this->setColour(ColourValue(1, 0, 0, 1));
-            //     }
-            //     else
-            //     {
-            //         setTextSize(0.04);
-            //         setPosition(Vector2(0.14, 0.1));
-            //         this->setColour(ColourValue(1, 1, 1, 1));
-            //         this->setCaption(points);
-            //     }
-            
-            // /////////////
-            //     int mult = this->SOBGame->getMultiplier();
-            //     const std::string& Multiplier = "X " + multi_cast<std::string>(mult);
-            //     this->setCaption(Multiplier);
-            //     this->setColour(ColourValue(1, 0, 0, clamp(float(mult * 0.1), 0.0f, 1.0f)));
-            //     this->setTextSize(clamp(float(mult * 0.1), 0.0f, 1.0f) * 0.01f + 0.04f);
-            
-        }
-    }
-
-    void SOBHUDInfo::changedOwner()
-    {
-        SUPER(SOBHUDInfo, changedOwner);
-
-        if (this->getOwner() && this->getOwner()->getGametype())
-        {
-            this->SOBGame = orxonox_cast<SOB*>(this->getOwner()->getGametype());
-        }
-        else
-        {
-            this->SOBGame = nullptr;
-        }
+        
     }
 }
+
+void SOBHUDInfo::changedOwner()
+{
+    SUPER(SOBHUDInfo, changedOwner);
+
+    if (this->getOwner() && this->getOwner()->getGametype())
+    {
+        this->SOBGame = orxonox_cast<SOB*>(this->getOwner()->getGametype());
+    }
+    else
+    {
+        this->SOBGame = nullptr;
+    }
+}
+}