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

Timestamp:

Jan 4, 2016, 6:31:29 PM (8 years ago)

Author:

landauf

Message:

use only default constructor (with context, but no other arguments)

File:

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

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

@@ -75 +75 @@
             //Outer Walls
             for(int i = 0; i<numCells; i++){
-                new HoverWall(origin_->getContext(), 0,        i+1,      cellSize, cellHeight, 1);
-                new HoverWall(origin_->getContext(), numCells, i+1,      cellSize, cellHeight, 1);
-                new HoverWall(origin_->getContext(), i+1,      0,        cellSize, cellHeight, 2);
-                new HoverWall(origin_->getContext(), i+1,      numCells, cellSize, cellHeight, 2);
+                (new HoverWall(origin_->getContext()))->init(0,        i+1,      cellSize, cellHeight, 1);
+                (new HoverWall(origin_->getContext()))->init(numCells, i+1,      cellSize, cellHeight, 1);
+                (new HoverWall(origin_->getContext()))->init(i+1,      0,        cellSize, cellHeight, 2);
+                (new HoverWall(origin_->getContext()))->init(i+1,      numCells, cellSize, cellHeight, 2);
             }
 
@@ -85 +85 @@
                 for(int x=0; x<numCells; x++){
                     switch(levelcode[ y * numCells + x ]){
-                        case 1: new HoverWall(origin_->getContext(), x+1, numCells-y, cellSize, cellHeight, 1);
+                        case 1: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
                                 break;
-                        case 3: new HoverWall(origin_->getContext(), x+1, numCells-y, cellSize, cellHeight, 1);
-                        case 2: new HoverWall(origin_->getContext(), x+1, numCells-y, cellSize, cellHeight, 0);
+                        case 3: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
+                        case 2: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 0);
                         default: break;
                     }
@@ -96 +96 @@
             //Generate 5 flags randomly
             for ( int i = 0; i < 5; i++ )
-                flagVector_.push_back(new HoverFlag(origin_->getContext(), rand()%numCells, rand()%numCells, cellSize));
+            {
+                HoverFlag* flag = new HoverFlag(origin_->getContext());
+                flag->init(rand()%numCells, rand()%numCells, cellSize);
+                flagVector_.push_back(flag);
+            }
 
             flags_ = flagVector_.size();