X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fsector.cpp;h=295c57dbb1f05a938beb7387487ec962dfa874a9;hb=f53572ad2b744ddddd7cc4b6479489543d44f98d;hp=dc9a699a6377ecd59bf27f29d9f60f2e5c1d6a9d;hpb=f81231933de4e2f826bd12a1433e1cef9a7fd71b;p=supertux.git diff --git a/src/sector.cpp b/src/sector.cpp index dc9a699a6..295c57dbb 100644 --- a/src/sector.cpp +++ b/src/sector.cpp @@ -115,10 +115,11 @@ Sector::~Sector() update_game_objects(); assert(gameobjects_new.size() == 0); - for(GameObjects::iterator i = gameobjects.begin(); i != gameobjects.end(); - ++i) { - before_object_remove(*i); - delete *i; + for(GameObjects::iterator i = gameobjects.begin(); + i != gameobjects.end(); ++i) { + GameObject* object = *i; + before_object_remove(object); + object->unref(); } for(SpawnPoints::iterator i = spawnpoints.begin(); i != spawnpoints.end(); @@ -454,6 +455,7 @@ Sector::add_object(GameObject* object) } #endif + object->ref(); gameobjects_new.push_back(object); } @@ -617,7 +619,7 @@ Sector::update_game_objects() before_object_remove(object); - delete *i; + object->unref(); i = gameobjects.erase(i); }