Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation/src/orxonox/overlays/stats/Scoreboard.cc

    r2495 r2498  
    5353    {
    5454        RegisterObject(Scoreboard);
    55         this->setGametype(creator->getGametype());
    5655    }
    5756
     
    8988        {
    9089            // create new lines
    91             this->lines_.push_back(new CreateLines(leftOffset, topOffset + (distance + height) * lines_.size(), width, height));
     90            CreateLines* lines = new CreateLines(leftOffset, topOffset + (distance + height) * lines_.size(), width, height);
     91            lines->setVisibility(this->isVisible());
     92            this->lines_.push_back(lines);
    9293        }
    9394        while (playerList.size() < this->lines_.size())
     
    121122        //    this->createlines_->setNumberOfColumns(numberOfColumns, i);
    122123
    123         //    // columnText = this->gametype_->getPlayersName();
     124        //    // columnText = this->getGametype()->getPlayersName();
    124125        //    columnText = "PlayerName";
    125126        //    this->createlines_->alignColumn(columnIndex, topOffset, leftOffset);
     
    129130        //    leftOffset = leftOffset + 0.3;
    130131
    131         //    // columnText = this->gametype_->getPlayersFrags();
     132        //    // columnText = this->getGametype()->getPlayersFrags();
    132133        //    columnText = "PlayerFrags";
    133134        //    this->createlines_->alignColumn(columnIndex, topOffset, leftOffset);
  • code/branches/presentation/src/orxonox/overlays/stats/Scoreboard.h

    r2495 r2498  
    5050        virtual void tick(float dt);
    5151
    52         inline void setGametype(Gametype* gt)
    53             { this->gametype_ = gt; }
    54         inline Gametype* getGametype() const
    55             { return this->gametype_; }
    56 
    5752        inline void setCreateLines(CreateLines* cl)
    5853            { this->createlines_ = cl; }
     
    7570        float lineSpacing;
    7671        std::string columnText;
    77         Gametype* gametype_;
    7872        CreateLines* createlines_;
    7973    };
Note: See TracChangeset for help on using the changeset viewer.