Changeset 11565

Timestamp:

Nov 20, 2017, 1:35:53 PM (7 years ago)

Author:

pascscha

Message:

death message initiated2

Location:

code/branches/FlappyOrx_HS17/src/modules/flappyorx

Files:

• FlappyOrx.cc (modified) (5 diffs)
• FlappyOrx.h (modified) (1 diff)
• FlappyOrxHUDinfo.cc (modified) (2 diffs)
• FlappyOrxShip.cc (modified) (3 diffs)
• FlappyOrxShip.h (modified) (1 diff)

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc

@@ -67 +67 @@
         point = 0;
         bShowLevel = false;
+        sDeathMessage = "hallihallo";
+        bIsDead = true;
         multiplier = 1;
         b_combo = false;
@@ -77 +79 @@
 
         if(this->tubes.size()==0||x-tubes.back()+tubeOffsetX>spawnDistance){
-            orxout()<<"true: ";
             spawnTube();
             this->tubes.push(x+tubeOffsetX);
         }
-        else{
-            orxout()<<"false:";
-        }
-        orxout()<<"x("<<x<<")- tubes.back()("<<tubes.back()<<") + tubeOffsetX("<<tubeOffsetX<<") > spawnDistance("<<spawnDistance<<")"<<std::endl;
         if(this->tubes.size()!=0&&x>this->tubes.front()){
             this->tubes.pop();
@@ -166 +163 @@
 
     void FlappyOrx::createAsteroid(Circle &c){
-        orxout() << "created Asteroid at x="<<c.x<<" y="<<c.y << std::endl;
-
         MovableEntity* newAsteroid = new MovableEntity(this->center_->getContext());
 
@@ -200 +195 @@
 
     bool FlappyOrx::isDead(){
-        return true;
+        return bIsDead;
     }
 
     std::string FlappyOrx::getDeathMessage(){
-        return "hello world";
+        return sDeathMessage;
     }
 
@@ -241 +236 @@
 
     void FlappyOrx::death(){
+        bIsDead = true;
+        sDeathMessage = "GameOver";
         if (Highscore::exists()){
                     int score = this->getPoints();
                     if(score > Highscore::getInstance().getHighestScoreOfGame("Flappy Orx")) 
                         Highscore::getInstance().storeHighscore("Flappy Orx",score);
-
         }
         point = -1;

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h

@@ -96 +96 @@
             bool bEndGame;
             bool bShowLevel;
+            bool bIsDead;
+            std::string sDeathMessage;
             std::queue<int> tubes;
             std::queue<MovableEntity*> asteroids;

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc

@@ -66 +66 @@
         if (this->FlappyOrxGame)
         {
-            // if (this->bShowLives_)  //preperation for easy mode
-            // {
-            //     const std::string& lives = multi_cast<std::string>(this->InvaderGame->getLives());
-            //     this->setCaption(lives);
-            // }
-            if(this->bShowPoints_)
-            {
-                const std::string& points = multi_cast<std::string>(this->FlappyOrxGame->getPoints());
-                if (not this->FlappyOrxGame->isDead())
-                {
+            if(not this->FlappyOrxGame->isDead()){
+                if(this->bShowPoints_){
+                    const std::string& points = multi_cast<std::string>(this->FlappyOrxGame->getPoints());
                     setTextSize(0.04);
                     setPosition(Vector2(0.14, 0.02));
@@ -81 +74 @@
                     this->setCaption(points);
                 }
+                else if(this->bShowGameOver_){
+                    setTextSize(0);
+                }
             }
-            if(this->bShowGameOver_){
-                if(this->FlappyOrxGame->isDead()){
+            else{
+                if(this->bShowGameOver_){
                     std::string message = this->FlappyOrxGame->getDeathMessage();
-                    setTextSize(0.4);
+                    setTextSize(0.1);
                     setPosition(Vector2(.5, .5));
                     this->setCaption(message);
                     this->setColour(ColourValue(1, 0, 0, 1));
                 }
-
-            }
-           
+            }   
         }
     }

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.cc

@@ -52 +52 @@
         this->speed = 1;
         this->gravity = 1;
+        isDead = true;
         
     }
@@ -68 +69 @@
         SUPER(FlappyOrxShip, tick, dt);
         //Execute movement
-        if (this->hasLocalController())
+        if (this->hasLocalController()&&not isDead)
         {
             if(getHealth()<0){
@@ -127 +128 @@
 
     void FlappyOrxShip::boost(bool boost){
+        if(isDead){
+            isDead = false;
+            getGame()->bIsDead = false;
+        }
         isFlapping=boost;
     }

code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxShip.h

@@ -83 +83 @@
             Camera* camera;
             bool isFlapping;
+            bool isDead;
             float speed, UpwardThrust, gravity;
             struct Velocity