Changeset 11043 for code/branches/presentationHS15/src/modules/hover/Hover.cc

Timestamp:

Jan 4, 2016, 8:59:19 PM (8 years ago)

Author:

landauf

Message:

more cleanup & deleting member objects in destructor

File:

• code/branches/presentationHS15/src/modules/hover/Hover.cc (modified) (2 diffs)

code/branches/presentationHS15/src/modules/hover/Hover.cc

@@ -49 +49 @@
 
         this->origin_ = NULL;
-        this->flags_ = 1;
+        this->numberOfFlags_ = 1;
         this->firstTick_ = true;
 
@@ -99 +99 @@
                 HoverFlag* flag = new HoverFlag(origin_->getContext());
                 flag->init(rand()%numCells, rand()%numCells, cellSize);
-                flagVector_.push_back(flag);
+                flags_.push_back(flag);
             }
-
-            flags_ = flagVector_.size();
 
         }//firsttick end
 
         // Check if ship collided with one of the flags
-        for ( unsigned int i = 0; i < flagVector_.size(); i++ ){
-            if(flagVector_[i]->getCollided()){
-                flagVector_[i]->destroyLater();
-                flagVector_.erase (flagVector_.begin()+i);
+        for ( unsigned int i = 0; i < flags_.size(); i++ ){
+            if(flags_[i]->getCollided()){
+                flags_[i]->destroyLater();
+                flags_.erase (flags_.begin()+i);
             }
         }
-        flags_ = flagVector_.size();
+        numberOfFlags_ = flags_.size();
     }
 }