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
/
Effects
/
Screen.cpp
diff --git
a/src/Effects/Screen.cpp
b/src/Effects/Screen.cpp
index
bfcc581
..
d75df37
100644
(file)
--- a/
src/Effects/Screen.cpp
+++ b/
src/Effects/Screen.cpp
@@
-68,7
+68,7
@@
Vector2 Screen::velocityDelta(const PhysicsEntity* e, float /*time_step*/) const
Vector2 acc(0,0);
- float CoR = e->CoR;
+ float CoR = e->
m_
CoR;
float radius = 0;
const Ball* b = dynamic_cast<const Ball*>(e);
if( b != NULL )