aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2017-06-26 20:10:11 +0200
committerLoic Blot <loic.blot@unix-experience.fr>2017-06-26 20:10:11 +0200
commita8650e785df3f12efa5f8cd3c6a695fb9e22a598 (patch)
treee5482c7bd56237615c601fd09d193810e717cedd
parent1d1d922a7aafc464ec4483a2f8caa8c49ddbbdee (diff)
downloadminetest-a8650e785df3f12efa5f8cd3c6a695fb9e22a598.tar.gz
minetest-a8650e785df3f12efa5f8cd3c6a695fb9e22a598.tar.bz2
minetest-a8650e785df3f12efa5f8cd3c6a695fb9e22a598.zip
Fix Camera::add_arm_inertia -> addArmInertia
-rw-r--r--src/camera.cpp4
-rw-r--r--src/camera.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/camera.cpp b/src/camera.cpp
index f75d6018d..dd4e3963b 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -194,7 +194,7 @@ void Camera::step(f32 dtime)
}
}
-void Camera::add_arm_inertia(f32 player_yaw, f32 frametime)
+void Camera::addArmInertia(f32 player_yaw, f32 frametime)
{
m_cam_vel.X = std::fabs((m_last_cam_pos.X - player_yaw) / m_timer.X) * 0.01f;
m_cam_vel.Y = std::fabs((m_last_cam_pos.Y - m_camera_direction.Y) / m_timer.Y);
@@ -458,7 +458,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 busytime,
m_cameranode->setFOV(m_fov_y);
if (m_arm_inertia)
- add_arm_inertia(player->getYaw(), frametime);
+ addArmInertia(player->getYaw(), frametime);
// Position the wielded item
//v3f wield_position = v3f(45, -35, 65);
diff --git a/src/camera.h b/src/camera.h
index 9ed4b7277..4b2d9d45e 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -166,7 +166,7 @@ public:
void drawNametags();
- inline void add_arm_inertia(f32 player_yaw, f32 frametime);
+ inline void addArmInertia(f32 player_yaw, f32 frametime);
private:
// Nodes