Changes in src/World.cpp [244d26:24a5e0]

File:

• src/World.cpp (modified) (5 diffs)

src/World.cpp

@@ -47 +47 @@
   OBSERVE;
   molecule *mol = NULL;
-  mol = new molecule(periode);
-  molecules_deprecated->insert(mol);
+  mol = NewMolecule();
   assert(!molecules.count(currMoleculeId));
+  mol->setId(currMoleculeId++);
   // store the molecule by ID
-  molecules[currMoleculeId++] = mol;
+  molecules[mol->getId()] = mol;
   mol->signOn(this);
   return mol;
+}
+
+void World::destroyMolecule(molecule* mol){
+  OBSERVE;
+  destroyMolecule(mol->getId());
+}
+
+void World::destroyMolecule(moleculeId_t id){
+  OBSERVE;
+  molecule *mol = molecules[id];
+  assert(mol);
+  DeleteMolecule(mol);
+  molecules.erase(id);
 }
 
@@ -83 +96 @@
 }
 
-void World::destroyAtom(int id) {
+void World::destroyAtom(atomId_t id) {
   OBSERVE;
   atom *atom = atoms[id];
@@ -131 +144 @@
 
 World::World() :
+    periode(new periodentafel),
+    atoms(),
     currAtomId(0),
+    molecules(),
     currMoleculeId(0),
-    periode(new periodentafel),
-    molecules_deprecated(new MoleculeListClass),
-    atoms(),
-    molecules()
+    molecules_deprecated(new MoleculeListClass(this))
 {
   molecules_deprecated->signOn(this);
@@ -145 +158 @@
   delete molecules_deprecated;
   delete periode;
-  AtomSet::iterator iter;
-  for(iter=atoms.begin();iter!=atoms.end();++iter){
-    DeleteAtom((*iter).second);
+  MoleculeSet::iterator molIter;
+  for(molIter=molecules.begin();molIter!=molecules.end();++molIter){
+    DeleteMolecule((*molIter).second);
+  }
+  molecules.clear();
+  AtomSet::iterator atIter;
+  for(atIter=atoms.begin();atIter!=atoms.end();++atIter){
+    DeleteAtom((*atIter).second);
   }
   atoms.clear();
@@ -188 +206 @@
   // should see that it gets the updated new world
   delete oldWorld;
+  return theWorld;
 }