Changeset 8178 for code/trunk/src/modules
- Timestamp:
- Apr 3, 2011, 7:56:47 PM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 4 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/lastmanstanding3 (added) merged: 7903,8155,8165,8170-8175
- Property svn:mergeinfo changed
-
code/trunk/src/modules/overlays/hud/CMakeLists.txt
r8079 r8178 17 17 LastManStandingInfos.cc 18 18 PauseNotice.cc 19 LastTeamStandingInfos.cc 19 20 ) -
code/trunk/src/modules/overlays/hud/GametypeStatus.cc
r7284 r8178 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/trunk/src/modules/overlays/hud/GametypeStatus.h
r7284 r8178 49 49 50 50 private: 51 //Gametype* game_; 51 52 PlayerInfo* owner_; 52 53 bool bNoCaption_; 54 //bool bForcedSpawn_; 53 55 54 56 };
Note: See TracChangeset
for help on using the changeset viewer.