Changeset 7903 for code/branches/lastmanstanding3/src/modules/overlays
- Timestamp:
- Feb 16, 2011, 11:17:30 AM (14 years ago)
- Location:
- code/branches/lastmanstanding3/src/modules/overlays/hud
- Files:
-
- 1 added
- 3 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/lastmanstanding3/src/modules/overlays/hud/CMakeLists.txt
r7655 r7903 16 16 GametypeFadingMessage.cc 17 17 LastManStandingInfos.cc 18 LastTeamStandingInfos.cc 18 19 ) -
code/branches/lastmanstanding3/src/modules/overlays/hud/GametypeStatus.cc
r7284 r7903 36 36 #include "worldentities/ControllableEntity.h" 37 37 #include "worldentities/pawns/Spectator.h" 38 //#include "gametypes/Gametype.h" 38 39 39 40 namespace orxonox … … 50 51 RegisterObject(GametypeStatus); 51 52 53 //this->game_ = 0; 52 54 this->owner_ = 0; 53 55 this->bNoCaption_ = false; 56 //this->bForcedSpawn_ = false; 54 57 55 58 ModifyConsoleCommand(__CC_GametypeStatus_name, __CC_displayCaption_name).setObject(this); … … 67 70 if (this->owner_ && this->owner_->getGametypeInfo() && this->owner_->getControllableEntity()) 68 71 { 72 //if (this->game_) 73 // this->bForcedSpawn_ = this->game_->getForceSpawn(); 74 //else 75 // this->bForcedSpawn_ = false; 76 69 77 const GametypeInfo* gtinfo = this->owner_->getGametypeInfo(); 70 78 ControllableEntity* ce = this->owner_->getControllableEntity(); … … 87 95 if (gtinfo->isStartCountdownRunning()) 88 96 this->setCaption(multi_cast<std::string>(static_cast<int>(ceil(gtinfo->getStartCountdown())))); 89 else if (ce->isA(Class(Spectator)) )97 else if (ce->isA(Class(Spectator))/*&&(!bForcedSpawn_)*/) 90 98 this->setCaption("Press [Fire] to respawn"); 91 99 else … … 101 109 { 102 110 SUPER(GametypeStatus, changedOwner); 103 111 //this->game_ = orxonox_cast<Gametype*>(this->getOwner()); 104 112 this->owner_ = orxonox_cast<PlayerInfo*>(this->getOwner()); 105 113 } -
code/branches/lastmanstanding3/src/modules/overlays/hud/GametypeStatus.h
r7284 r7903 49 49 50 50 private: 51 //Gametype* game_; 51 52 PlayerInfo* owner_; 52 53 bool bNoCaption_; 54 //bool bForcedSpawn_; 53 55 54 56 }; -
code/branches/lastmanstanding3/src/modules/overlays/hud/LastTeamStandingInfos.h
r7902 r7903 21 21 * 22 22 * Author: 23 * Fabian 'x3n' Landau23 * Johannes Ritz 24 24 * Co-authors: 25 * ...25 * 26 26 * 27 27 */ 28 28 29 #ifndef _ GametypeStatus_H__30 #define _ GametypeStatus_H__29 #ifndef _LastTeamStandingInfos_H__ 30 #define _LastTeamStandingInfos_H__ 31 31 32 32 #include "overlays/OverlaysPrereqs.h" … … 37 37 namespace orxonox 38 38 { 39 class _OverlaysExport GametypeStatus : public OverlayText, public Tickable39 class _OverlaysExport LastTeamStandingInfos : public OverlayText, public Tickable 40 40 { 41 41 public: 42 GametypeStatus(BaseObject* creator);43 virtual ~ GametypeStatus();42 LastTeamStandingInfos(BaseObject* creator); 43 virtual ~LastTeamStandingInfos(); 44 44 45 45 virtual void tick(float dt); 46 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 46 47 virtual void changedOwner(); 47 48 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_; } 49 58 50 59 private: 51 PlayerInfo* owner_; 52 bool bNoCaption_; 53 60 LastTeamStanding* lts_; 61 PlayerInfo* player_; 62 bool bShowLives_; 63 bool bShowTeams_; 54 64 }; 55 65 } 56 #endif /* _ GametypeStatus_H__ */66 #endif /* _LastTeamStandingInfos_H__ */
Note: See TracChangeset
for help on using the changeset viewer.