Changeset 6312 for code/branches
- Timestamp:
- Dec 9, 2009, 11:23:29 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc
r6310 r6312 298 298 299 299 void NewHumanController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) { 300 if ( showDamageOverlay_) {300 if ( this->showDamageOverlay_ && !this->controlPaused_ && this->controllableEntity_ && !this->controllableEntity_->isInMouseLook() ) { 301 301 Vector3 posA; 302 302 if ( originator ) … … 331 331 if ( relativeHit.y > threshold) //Top 332 332 { 333 this->damageOverlayBottom_->show(); 334 this->damageOverlayTB_ = this->damageOverlayTime_; 335 //this->damageOverlayTop_->setBackgroundAlpha(0.3); 336 } 337 if ( relativeHit.y < -threshold) //Bottom 338 { 333 339 this->damageOverlayTop_->show(); 334 340 this->damageOverlayTT_ = this->damageOverlayTime_; 335 //this->damageOverlayTop_->setBackgroundAlpha(0.3);336 }337 if ( relativeHit.y < -threshold) //Bottom338 {339 this->damageOverlayBottom_->show();340 this->damageOverlayTB_ = this->damageOverlayTime_;341 341 //this->damageOverlayBottom_->setBackgroundAlpha(0.3); 342 342 }
Note: See TracChangeset
for help on using the changeset viewer.