Changeset 11589 for code/branches

Timestamp:

Nov 27, 2017, 12:42:32 PM (7 years ago)

Author:

pascscha

Message:

svn commit -m

Location:

code/branches/FlappyOrx_HS17

Files:

• data/levels/Invaders.oxw (modified) (1 diff)
• src/modules/flappyorx/FlappyOrx.cc (modified) (2 diffs)
• src/modules/flappyorx/FlappyOrx.h (modified) (1 diff)
• src/modules/flappyorx/FlappyOrxHUDinfo.cc (modified) (1 diff)

code/branches/FlappyOrx_HS17/data/levels/Invaders.oxw

@@ -48 +48 @@
 
     
-    <FlappyOrxCenterPoint name=flappyorxcenter />
+    <InvaderCenterPoint name=invadercenter />
     <?lua
       for i = 1, 30, 1 do

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

@@ -69 +69 @@
         sDeathMessage = "Welcome to FlappyOrx";
         bIsDead = true;
-        multiplier = 1;
-        b_combo = false;
         this->spawnDistance=200;
         this->tubeOffsetX=500;
         this->setHUDTemplate("FlappyOrxHUD");
+        firstGame = true;
     }
 
@@ -225 +224 @@
     void FlappyOrx::death(){
         bIsDead = true;
+        firstGame = false;
         
         if(point<10)        sDeathMessage = DeathMessage10[rand()%(DeathMessage10.size())];

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

@@ -96 +96 @@
             bool bShowLevel;
             bool bIsDead;
+            bool firstGame;
             std::string sDeathMessage;
             std::queue<int> tubes;

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

@@ -81 +81 @@
                 }
                 else if(this->bShowGameOver_){
-                    std::string message;
-                    setTextSize(0.05);
-                    switch(messageID){
-                        case 0:
-                            message = "Game Over";
-                            setTextSize(0.1);
-                            this->setCaption(message);
-                        break;
-                        case 1:
-                            message = this->FlappyOrxGame->sDeathMessage;
-                        break;
-                        case 2:
-                            message = "Your Score: "+multi_cast<std::string>(this->FlappyOrxGame->getPoints())+
-                                                    "  Local High Score: "+multi_cast<std::string>(Highscore::getInstance().getHighestScoreOfGame("Flappy Orx"));
-                        break;
-                        case 3:
-                            message = "Press space to restart.";
-                        break;
+                    if(this->FlappyOrxGame->firstGame){
+                        if(messageID==3){
+                            setTextSize(0.05);
+                            this->setCaption("press space to start");
+                        }
                     }
-                    this->setCaption(message);
+                    else{
+                        std::string message;
+                        setTextSize(0.05);
+                        switch(messageID){
+                            case 0:
+                                message = "Game Over";
+                                setTextSize(0.1);
+                                this->setCaption(message);
+                            break;
+                            case 1:
+                                message = this->FlappyOrxGame->sDeathMessage;
+                            break;
+                            case 2:
+                                message = "Your Score: "+multi_cast<std::string>(this->FlappyOrxGame->getPoints())+
+                                                        "  Local High Score: "+multi_cast<std::string>(Highscore::getInstance().getHighestScoreOfGame("Flappy Orx"));
+                            break;
+                            case 3:
+                                message = "Press space to restart.";
+                            break;
+                        }
+                        this->setCaption(message);
+                    }
                 }
             }