Changeset 5800
- Timestamp:
- Sep 26, 2009, 10:21:26 PM (15 years ago)
- Location:
- code/branches/core5/src/modules
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core5/src/modules/objects/eventsystem/EventDispatcher.cc
r5738 r5800 47 47 if (this->isInitialized()) 48 48 for (std::list<EventTarget*>::iterator it = this->targets_.begin(); it != this->targets_.end(); ++it) 49 delete (*it);49 (*it)->destroy(); 50 50 } 51 51 -
code/branches/core5/src/modules/overlays/hud/HUDHealthBar.cc
r5738 r5800 56 56 { 57 57 if (this->isInitialized()) 58 delete this->textoverlay_;58 this->textoverlay_->destroy(); 59 59 } 60 60 -
code/branches/core5/src/modules/overlays/hud/UnderAttackHealthBar.cc
r5738 r5800 58 58 { 59 59 if (this->isInitialized()) 60 delete this->text_;60 this->text_->destroy(); 61 61 } 62 62 -
code/branches/core5/src/modules/overlays/stats/CreateLines.cc
r5738 r5800 59 59 CreateLines::~CreateLines() 60 60 { 61 delete this->playerNameText_;62 delete this->scoreText_;63 delete this->deathsText_;64 delete this->background_;61 this->playerNameText_->destroy(); 62 this->scoreText_->destroy(); 63 this->deathsText_->destroy(); 64 this->background_->destroy(); 65 65 } 66 66 -
code/branches/core5/src/modules/pong/Pong.cc
r5738 r5800 120 120 if (this->ball_) 121 121 { 122 delete this->ball_;122 this->ball_->destroy(); 123 123 this->ball_ = 0; 124 124 } -
code/branches/core5/src/modules/pong/PongAI.cc
r5738 r5800 61 61 { 62 62 for (std::list<std::pair<Timer<PongAI>*, char> >::iterator it = this->reactionTimers_.begin(); it != this->reactionTimers_.end(); ++it) 63 delete (*it).first;63 (*it).first->destroy(); 64 64 } 65 65 … … 247 247 // Destroy the timer and remove it from the list 248 248 Timer<PongAI>* timer = this->reactionTimers_.front().first; 249 delete timer;249 timer->destroy(); 250 250 251 251 this->reactionTimers_.pop_front(); -
code/branches/core5/src/modules/questsystem/QuestGUI.cc
r5748 r5800 79 79 80 80 if(this->root_ != NULL) 81 delete this->root_;81 this->root_->destroy(); 82 82 } 83 83 … … 146 146 COUT(3) << "Clearing Node '" << *str << "' ..." << std::endl; 147 147 delete str; 148 delete node;148 node->destroy(); 149 149 } 150 150 this->nodes_.clear(); -
code/branches/core5/src/modules/questsystem/QuestManager.cc
r5755 r5800 76 76 for(std::map<PlayerInfo*, QuestGUI*>::iterator it = this->questGUIs_.begin(); it != this->questGUIs_.end(); it++) 77 77 { 78 delete (*it).second;78 (*it).second->destroy(); 79 79 } 80 80 this->questGUIs_.clear(); -
code/branches/core5/src/modules/questsystem/notifications/NotificationQueue.cc
r5748 r5800 426 426 this->containers_.erase(container); 427 427 this->overlays_.erase(container->notification); 428 delete container->overlay;428 container->overlay->destroy(); 429 429 delete container; 430 430 this->size_= this->size_-1; -
code/branches/core5/src/modules/weapons/projectiles/ParticleProjectile.cc
r5738 r5800 59 59 { 60 60 this->detachOgreObject(this->particles_->getParticleSystem()); 61 delete this->particles_;61 this->particles_->destroy(); 62 62 } 63 63 } -
code/branches/core5/src/modules/weapons/projectiles/Projectile.cc
r5738 r5800 84 84 85 85 if (this->bDestroy_) 86 delete this;86 this->destroy(); // TODO: use a scheduler instead of deleting the object right here in tick() 87 87 } 88 88 … … 90 90 { 91 91 if (GameMode::isMaster()) 92 delete this;92 this->destroy(); 93 93 } 94 94
Note: See TracChangeset
for help on using the changeset viewer.