Changeset 5935 for code/branches/pickup/src/orxonox/infos/HumanPlayer.cc
- Timestamp:
- Oct 13, 2009, 5:05:17 PM (15 years ago)
- Location:
- code/branches/pickup
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/pickup
- Property svn:mergeinfo changed
-
code/branches/pickup/src/orxonox/infos/HumanPlayer.cc
r5781 r5935 64 64 { 65 65 if (this->humanHud_) 66 delete this->humanHud_;66 this->humanHud_->destroy(); 67 67 68 68 if (this->gametypeHud_) 69 delete this->gametypeHud_;69 this->gametypeHud_->destroy(); 70 70 } 71 71 } … … 116 116 117 117 if (!GameMode::isMaster()) 118 this->set ObjectMode(ObjectDirection::Bidirectional);118 this->setSyncMode(ObjectDirection::Bidirectional); 119 119 else 120 120 this->setName(this->nick_); … … 162 162 163 163 if (this->isInitialized() && this->isLocalPlayer()) 164 if (this->getGametype()->getHUDTemplate() != "") 164 { 165 if (this->getGametype() && this->getGametype()->getHUDTemplate() != "") 165 166 this->setGametypeHUDTemplate(this->getGametype()->getHUDTemplate()); 167 else 168 this->setGametypeHUDTemplate(""); 169 } 166 170 } 167 171 … … 170 174 if (this->humanHud_) 171 175 { 172 delete this->humanHud_;176 this->humanHud_->destroy(); 173 177 this->humanHud_ = 0; 174 178 } 175 179 176 if (this->isLocalPlayer() && this->humanHudTemplate_ != "" )180 if (this->isLocalPlayer() && this->humanHudTemplate_ != "" && GameMode::showsGraphics()) 177 181 { 178 182 this->humanHud_ = new OverlayGroup(this); … … 186 190 if (this->gametypeHud_) 187 191 { 188 delete this->gametypeHud_;192 this->gametypeHud_->destroy(); 189 193 this->gametypeHud_ = 0; 190 194 }
Note: See TracChangeset
for help on using the changeset viewer.