Changeset 11510 for code/branches/HUD_HS16/src/modules/overlays
- Timestamp:
- Oct 23, 2017, 4:41:56 PM (7 years ago)
- Location:
- code/branches/HUD_HS16/src/modules/overlays/hud
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupItem.cc
r11336 r11510 59 59 HUDPickupItem::~HUDPickupItem() 60 60 { 61 if (this->isInitialized())61 /*if (this->isInitialized()) 62 62 { 63 63 overlayElement_=nullptr; 64 } 64 }*/ 65 65 } 66 66 … … 79 79 assert(this->background_); 80 80 overlayElement_->hide(); 81 this->background_->removeChild(overlayElement_->getName());81 //this->background_->removeChild(overlayElement_->getName()); 82 82 } 83 83 } -
code/branches/HUD_HS16/src/modules/overlays/hud/HUDPickupSystem.cc
r11351 r11510 56 56 HUDPickupSystem::~HUDPickupSystem() 57 57 { 58 if (this->isInitialized())58 /*if (this->isInitialized()) 59 59 { 60 60 this->picks.clear(); 61 } 61 }*/ 62 62 } 63 63 … … 107 107 { 108 108 assert(pickup); 109 orxout()<< "removePickup called with " << pickup << endl; 109 110 HUDPickupItem* item = this->picks.find(pickup)->second; 110 orxout( internal_info, context::pickups) << "removePickup: pickup= " << pickup << " item= " << item << endl;111 assert(item);111 orxout() << "removePickup: pickup= " << pickup << " item= " << item << endl; 112 //assert(item); 112 113 item->hideMe(pickup, repaint); 113 assert(overlayElement_); 114 assert(this->background_); 115 this->picks.erase(pickup); 114 orxout() << "i am hidden now" << endl; 115 //assert(overlayElement_); 116 //assert(this->background_); 117 //this->picks.erase(pickup); 118 orxout()<< "end removePickup method" << endl; 116 119 } 117 120
Note: See TracChangeset
for help on using the changeset viewer.