Changeset 12359 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.cc

Timestamp:

May 9, 2019, 3:29:29 PM (5 years ago)

Author:

ahuwyler

Message:

fuer de jerome

File:

• code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.cc (modified) (5 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxScore.cc

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
 #include "util/Convert.h"
 
@@ -41 +40 @@
 
 #include "OrxoBlox.h"
-#include "sound/WorldSound.h" /////////////////////////////
 
 namespace orxonox
@@ -56 +54 @@
 
         this->owner_ = nullptr;
-
-        this->bShowName_ = true;
-        this->bShowScore_ = true;
-        this->bShowPlayer_ = true;
-    }
+        this->player_ = nullptr;
 
     /**
@@ -70 +64 @@
     }
 
-    /**
-    @brief
-        Method to create a OrxoBloxScore through XML.
-    */
-    void OrxoBloxScore::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(OrxoBloxScore, XMLPort, xmlelement, mode);
-
-        XMLPortParam(OrxoBloxScore, "showname",        setShowName,        getShowName,        xmlelement, mode).defaultValues(false);
-        XMLPortParam(OrxoBloxScore, "showscore",       setShowScore,       getShowScore,       xmlelement, mode).defaultValues(false);
-        XMLPortParam(OrxoBloxScore, "showplayer",  setShowPlayer,  getShowPlayer,  xmlelement, mode).defaultValues(false);
-    }
-
+    
     /**
     @brief
@@ -97 +79 @@
         if (this->owner_ != nullptr)
         {
-            if (!this->owner_->hasEnded())
+            std::string score("0");
+            if(!this->owner_->hasEnded())
             {
-                // Get the player.
-                //Fehlermeldung
-                //player1_ = this->owner_->getPlayer();
+                //get the player
+                player_ = this->owner_->getPlayer();
             }
 
-            std::string name1;
-
-            std::string score1("0");
-
-            // Save the name and score of each player as a string.
-            if (player1_ != nullptr)
+            if(this->owner_->hasStarted())
             {
-                name1 = player1_->getName();
-                score1 = multi_cast<std::string>(this->owner_->getScore(player1_));
+                // Save the name and score of each player as a string.
+                if (player_ != nullptr)
+                    score = multi_cast<std::string>(this->owner_->getScore(player_));
             }
-
-            // Assemble the strings, depending on what should all be displayed.
-            std::string output1;
-            if (this->bShowPlayer_)
-            {
-                if (this->bShowName_ && this->bShowScore_ && player1_ != nullptr)
-                    output1 = name1 + " - " + score1;
-                else if (this->bShowScore_)
-                    output1 = score1;
-                else if (this->bShowName_)
-                    output1 = name1;
-            }
-
-            std::string output("OrxoBlox");
-            /* Keine Ahnung wofuer das gut ist.
-
-            if (this->bShowName_ || this->bShowScore_)
-            {
-                if (this->bShowLeftPlayer_ && this->bShowRightPlayer_)
-                    output = output1 + ':' + output2;
-                else if (this->bShowLeftPlayer_ || this->bShowRightPlayer_)
-                    output = output1 + output2;
-            }*/
-
-            this->setCaption(output);
+            this->setCaption(score);
         }
     }