projects
/
physics.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
named members m_* to quite -Wshadow
[physics.git]
/
src
/
entityCreator.cpp
diff --git
a/src/entityCreator.cpp
b/src/entityCreator.cpp
index
f44eda0
..
3f749e7
100644
(file)
--- a/
src/entityCreator.cpp
+++ b/
src/entityCreator.cpp
@@
-67,28
+67,28
@@
void creator::init()
s_startPolys.init();
pBall = addBall(Vector2(50, 50), 20, cWhite, s_startBalls);
s_startPolys.init();
pBall = addBall(Vector2(50, 50), 20, cWhite, s_startBalls);
- pBall->mass = fStartMass;
+ pBall->m
_m
ass = fStartMass;
pBall = addBall(Vector2(150, 50), 20, cGrey, s_startBalls);
pBall = addBall(Vector2(150, 50), 20, cGrey, s_startBalls);
- pBall->mass = fStartMass;
+ pBall->m
_m
ass = fStartMass;
pBall = addBall(Vector2(50, 100), 20, cRed, s_startBalls);
pBall = addBall(Vector2(50, 100), 20, cRed, s_startBalls);
- pBall->mass = fStartMass;
+ pBall->m
_m
ass = fStartMass;
pBall = addBall(Vector2(100, 100), 20, cGreen, s_startBalls);
pBall = addBall(Vector2(100, 100), 20, cGreen, s_startBalls);
- pBall->mass = fStartMass;
+ pBall->m
_m
ass = fStartMass;
pBall = addBall(Vector2(150, 100), 20, cBlue, s_startBalls);
pBall = addBall(Vector2(150, 100), 20, cBlue, s_startBalls);
- pBall->mass = fStartMass;
+ pBall->m
_m
ass = fStartMass;
pBall = addBall(Vector2(50, 150), 20, cYellow, s_startBalls);
pBall = addBall(Vector2(50, 150), 20, cYellow, s_startBalls);
- pBall->mass = fStartMass;
+ pBall->m
_m
ass = fStartMass;
pBall = addBall(Vector2(100, 150), 20, cMagenta, s_startBalls);
pBall = addBall(Vector2(100, 150), 20, cMagenta, s_startBalls);
- pBall->mass = fStartMass;
+ pBall->m
_m
ass = fStartMass;
pBall = addBall(Vector2(150, 150), 20, cCyan, s_startBalls);
pBall = addBall(Vector2(150, 150), 20, cCyan, s_startBalls);
- pBall->mass = fStartMass;
+ pBall->m
_m
ass = fStartMass;
for( int i = 0; i < 50; i++)
for( int i = 0; i < 50; i++)