Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 16, 2011, 11:17:30 AM (13 years ago)
Author:
scheusso
Message:

Merge branch 'jo-test' into lms3

File:
1 copied

Legend:

Unmodified
Added
Removed
  • code/branches/lastmanstanding3/src/modules/overlays/hud/LastTeamStandingInfos.h

    r7902 r7903  
    2121 *
    2222 *   Author:
    23  *      Fabian 'x3n' Landau
     23 *      Johannes Ritz
    2424 *   Co-authors:
    25  *      ...
     25 *     
    2626 *
    2727 */
    2828
    29 #ifndef _GametypeStatus_H__
    30 #define _GametypeStatus_H__
     29#ifndef _LastTeamStandingInfos_H__
     30#define _LastTeamStandingInfos_H__
    3131
    3232#include "overlays/OverlaysPrereqs.h"
     
    3737namespace orxonox
    3838{
    39     class _OverlaysExport GametypeStatus : public OverlayText, public Tickable
     39    class _OverlaysExport LastTeamStandingInfos : public OverlayText, public Tickable
    4040    {
    4141        public:
    42             GametypeStatus(BaseObject* creator);
    43             virtual ~GametypeStatus();
     42            LastTeamStandingInfos(BaseObject* creator);
     43            virtual ~LastTeamStandingInfos();
    4444
    4545            virtual void tick(float dt);
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    4647            virtual void changedOwner();
    4748
    48             void setDisplayCaption(bool bValue); //!< Toggles whether the gametype status is displayed.
     49            inline void setShowLives(bool value)
     50                { this->bShowLives_ = value; }
     51            inline bool getShowLives() const
     52                { return this->bShowLives_; }
     53
     54            inline void setShowTeams(bool value)
     55                { this->bShowTeams_ = value; }
     56            inline bool getShowTeams() const
     57                { return this->bShowTeams_; }
    4958
    5059        private:
    51             PlayerInfo* owner_;
    52             bool bNoCaption_;
    53 
     60            LastTeamStanding* lts_;
     61            PlayerInfo* player_;
     62            bool bShowLives_;
     63            bool bShowTeams_;
    5464    };
    5565}
    56 #endif /* _GametypeStatus_H__ */
     66#endif /* _LastTeamStandingInfos_H__ */
Note: See TracChangeset for help on using the changeset viewer.