diff options
| author | est31 <MTest31@outlook.com> | 2016-01-25 00:06:01 +0100 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2016-01-29 15:53:54 +0100 |
| commit | 4e93ba06a749fa2503786bf8d7dbda3d1e36a65a (patch) | |
| tree | a694b86c85ab9b14e59ae060ea51eba6c44c8ce9 /src/content_cao.cpp | |
| parent | ad884f23d4e73d38ce0f529de49591dd66cee44d (diff) | |
| download | minetest-4e93ba06a749fa2503786bf8d7dbda3d1e36a65a.tar.gz minetest-4e93ba06a749fa2503786bf8d7dbda3d1e36a65a.tar.bz2 minetest-4e93ba06a749fa2503786bf8d7dbda3d1e36a65a.zip | |
Don't pass non-const references to collision methods
Non const references cause a lot of confusion with behaviour of code,
and are disallowed by minetest style guide.
Diffstat (limited to 'src/content_cao.cpp')
| -rw-r--r-- | src/content_cao.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp index 1b8e84c8f..c3247bd17 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -1192,15 +1192,13 @@ void GenericCAO::step(float dtime, ClientEnvironment *env) f32 pos_max_d = BS*0.125; // Distance per iteration v3f p_pos = m_position; v3f p_velocity = m_velocity; - v3f p_acceleration = m_acceleration; moveresult = collisionMoveSimple(env,env->getGameDef(), pos_max_d, box, m_prop.stepheight, dtime, - p_pos, p_velocity, p_acceleration, + &p_pos, &p_velocity, m_acceleration, this, m_prop.collideWithObjects); // Apply results m_position = p_pos; m_velocity = p_velocity; - m_acceleration = p_acceleration; bool is_end_position = moveresult.collides; pos_translator.update(m_position, is_end_position, dtime); |