[Orxonox-commit 6968] r11589 - in code/branches/FlappyOrx_HS17: data/levels src/modules/flappyorx

[pascscha at orxonox.net]

Author: pascscha
Date: 2017-11-27 12:42:32 +0100 (Mon, 27 Nov 2017)
New Revision: 11589

Modified:
   code/branches/FlappyOrx_HS17/data/levels/Invaders.oxw
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h
   code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc
Log:
svn commit -m

Modified: code/branches/FlappyOrx_HS17/data/levels/Invaders.oxw
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/Invaders.oxw	2017-11-24 12:15:12 UTC (rev 11588)
+++ code/branches/FlappyOrx_HS17/data/levels/Invaders.oxw	2017-11-27 11:42:32 UTC (rev 11589)
@@ -47,7 +47,7 @@
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=FlappyOrxShip pawndesign=spaceshipFlappyOrx />
 
     
-    <FlappyOrxCenterPoint name=flappyorxcenter />
+    <InvaderCenterPoint name=invadercenter />
     <?lua
       for i = 1, 30, 1 do
         j = math.random()

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc	2017-11-24 12:15:12 UTC (rev 11588)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.cc	2017-11-27 11:42:32 UTC (rev 11589)
@@ -68,11 +68,10 @@
         bShowLevel = false;
         sDeathMessage = "Welcome to FlappyOrx";
         bIsDead = true;
-        multiplier = 1;
-        b_combo = false;
         this->spawnDistance=200;
         this->tubeOffsetX=500;
         this->setHUDTemplate("FlappyOrxHUD");
+        firstGame = true;
     }
 
     void FlappyOrx::updatePlayerPos(int x){
@@ -224,6 +223,7 @@
 
     void FlappyOrx::death(){
         bIsDead = true;
+        firstGame = false;
         
         if(point<10)        sDeathMessage = DeathMessage10[rand()%(DeathMessage10.size())];
         else if(point<30)   sDeathMessage = DeathMessage30[rand()%(DeathMessage30.size())];

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h	2017-11-24 12:15:12 UTC (rev 11588)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrx.h	2017-11-27 11:42:32 UTC (rev 11589)
@@ -95,6 +95,7 @@
             bool bEndGame;
             bool bShowLevel;
             bool bIsDead;
+            bool firstGame;
             std::string sDeathMessage;
             std::queue<int> tubes;
             std::queue<MovableEntity*> asteroids;

Modified: code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc
===================================================================
--- code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc	2017-11-24 12:15:12 UTC (rev 11588)
+++ code/branches/FlappyOrx_HS17/src/modules/flappyorx/FlappyOrxHUDinfo.cc	2017-11-27 11:42:32 UTC (rev 11589)
@@ -80,26 +80,34 @@
                     setTextSize(0);
                 }
                 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);
+                    }
                 }
             }   
         }