Changeset 2498

Timestamp:

Dec 17, 2008, 6:02:47 AM (16 years ago)

Author:

landauf

Message:

removed additional gametype_ from scoreboard
initialize scoreboard lines with visible=false

Location:

code/branches/presentation/src/orxonox/overlays/stats

Files:

• Scoreboard.cc (modified) (4 diffs)
• Scoreboard.h (modified) (2 diffs)

code/branches/presentation/src/orxonox/overlays/stats/Scoreboard.cc

@@ -53 +53 @@
     {
         RegisterObject(Scoreboard);
-        this->setGametype(creator->getGametype());
     }
 
@@ -89 +88 @@
         {
             // create new lines
-            this->lines_.push_back(new CreateLines(leftOffset, topOffset + (distance + height) * lines_.size(), width, height));
+            CreateLines* lines = new CreateLines(leftOffset, topOffset + (distance + height) * lines_.size(), width, height);
+            lines->setVisibility(this->isVisible());
+            this->lines_.push_back(lines);
         }
         while (playerList.size() < this->lines_.size())
@@ -121 +122 @@
         //    this->createlines_->setNumberOfColumns(numberOfColumns, i);
 
-        //    // columnText = this->gametype_->getPlayersName();
+        //    // columnText = this->getGametype()->getPlayersName();
         //    columnText = "PlayerName";
         //    this->createlines_->alignColumn(columnIndex, topOffset, leftOffset);
@@ -129 +130 @@
         //    leftOffset = leftOffset + 0.3;
 
-        //    // columnText = this->gametype_->getPlayersFrags();
+        //    // columnText = this->getGametype()->getPlayersFrags();
         //    columnText = "PlayerFrags";
         //    this->createlines_->alignColumn(columnIndex, topOffset, leftOffset);

code/branches/presentation/src/orxonox/overlays/stats/Scoreboard.h

@@ -50 +50 @@
         virtual void tick(float dt);
 
-        inline void setGametype(Gametype* gt)
-            { this->gametype_ = gt; }
-        inline Gametype* getGametype() const
-            { return this->gametype_; }
-
         inline void setCreateLines(CreateLines* cl)
             { this->createlines_ = cl; }
@@ -75 +70 @@
         float lineSpacing;
         std::string columnText;
-        Gametype* gametype_;
         CreateLines* createlines_;
     };