named members m_* to quite -Wshadow

[physics.git] / src / entityCreator.cpp

diff --git a/src/entityCreator.cpp b/src/entityCreator.cpp
index 34b9a56..3f749e7 100644 (file)
--- a/src/entityCreator.cpp
+++ b/src/entityCreator.cpp
@@ -29,8 +29,6 @@
 
 /// ***** Private Variables *****
 
-//static bear::Queue<int> s_test;
-
 typedef bear::Queue<Ball*>      queBall;
 typedef bear::Queue<Polygon*>   quePoly;
 
@@ -69,28 +67,28 @@ void creator::init()
     s_startPolys.init();
 
     pBall = addBall(Vector2(50, 50), 20, cWhite, s_startBalls);
-    pBall->mass = fStartMass;
+    pBall->m_mass = fStartMass;
 
     pBall = addBall(Vector2(150, 50), 20, cGrey, s_startBalls);
-    pBall->mass = fStartMass;
+    pBall->m_mass = fStartMass;
 
     pBall = addBall(Vector2(50, 100), 20, cRed, s_startBalls);
-    pBall->mass = fStartMass;
+    pBall->m_mass = fStartMass;
 
     pBall = addBall(Vector2(100, 100), 20, cGreen, s_startBalls);
-    pBall->mass = fStartMass;
+    pBall->m_mass = fStartMass;
 
     pBall = addBall(Vector2(150, 100), 20, cBlue, s_startBalls);
-    pBall->mass = fStartMass;
+    pBall->m_mass = fStartMass;
 
     pBall = addBall(Vector2(50, 150), 20, cYellow, s_startBalls);
-    pBall->mass = fStartMass;
+    pBall->m_mass = fStartMass;
 
     pBall = addBall(Vector2(100, 150), 20, cMagenta, s_startBalls);
-    pBall->mass = fStartMass;
+    pBall->m_mass = fStartMass;
 
     pBall = addBall(Vector2(150, 150), 20, cCyan, s_startBalls);
-    pBall->mass = fStartMass;
+    pBall->m_mass = fStartMass;
 
 
     for( int i = 0; i < 50; i++)
@@ -105,6 +103,10 @@ void creator::init()
     points.push_back(Vector2(500,300));
 
     addPoly(points, cRed, s_startPolys);
+
+
+    s_startPolys.trim();
+    s_startBalls.trim();
 }
 void creator::clean()
 {